Mask subscription manager password

It was displaying in plain text in logs
https://bugzilla.redhat.com/show_bug.cgi?id=895145
Also removed useless if statement

Change-Id: I94364c3829f1c7f4e154f780bee72268570998ad
Merge "Mask subscription manager password"