Merge changes If401164b,I84949081

* changes:
  Add missing flags to DPMS.
  add missed flag for getAccountTypesWithManagementDisabledAsUser