backport refactoring and password censoring from suse-cloud-2.0