Merge "Fixes testCreateAndManageUser_newUserDisclaimer"