Merge "Add new config option for nova policy available defaults"