Merge "Lockdown DPMS.getOrganizationNameForUser()" into sc-qpr1-dev