Updated Master to fix issues with using SWIFT backend

When using a swift backend the paste flavor was defaulting to "flavor = keystone+cachemanagement" which was wrong. This has been corrected. 

I reverted the default image name from ubuntu to precise

In the cache conf , swift variables will not be put in place unless the default store is set to swift.