Merge "Use correct password for keystone bootstrap"