Merge "remove wsgi keystone config files"