Merge "Run keystone-manage bootstrap for HA deployment too"