Merge "Replaces DPM.clearLogoutUser() by logoutUser()"