Merge changes Id25696e4,I939a12a2 into klp-dev

* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString