SERVER-12241 Combine internal action types into one
SERVER-12243 SERVER-12239 Remove dead authz code
Merge remote-tracking branch 'upstream/master'