Merge "DPM.createAndManageUser should work even with DISALLOW_ADD_USER set" into nyc-dev