SERVER-14212 When restoring users and roles for a single db with --drop, don't drop users/roles from other databases
(cherry picked from commit 7dbc49a56d010ceaf6d9b57f373863763fe10280)
SERVER-14355 Allow dbAdmin role to create system.profile collection with custom size
(cherry picked from commit 8f071ee21b4763f0c88832a422865ec078940631)
Merge remote-tracking branch 'upstream/v2.6' into v2.6