EE port of protected-branches-no-one-merge

Open Phil Hughes requested to merge ee-protected-branches-no-one-merge into master