Merge "modified to use the next charm as hacluster charm issue with keystone." into...