Config cleanup + cinder needs policy.json

Change-Id: Iaea2a5c45039a2d549678594bd9df6de3a754352
Merge "Config cleanup + cinder needs policy.json"