Merge "Make creation of keystone admin endpoint optional"