Merge "[Bouncer] Remove duplicate manage users." into tm-qpr-dev