Fix bug when referring to storage_policies

* Storage policies were moved into swift: in the user_config
* Fix typo on template drop for swift_common