Merge "Fix Cleanups for keystone/placement/nova"