Merge "Add note on openStackEncryptedPassword" into beijing