Merge "fix the username to login undercloud in Apex"