Merge "Conform with OpenStackUser.get_os_creds() in juju_epc"