Put new encrypted openshift password.
Merge remote-tracking branch 'origin/master'