Merge "Fix MSO encrypted password on long namespaces"