fix pam workaround
Merge branch 'master' into java7

* master:
  fix pam workaround