one more place to set S3 PFS default
Mesa 1.6.1 to roxy merge - S3 pull from source by default should be false
Mesa 1.6.1 to roxy merge - DE1389 - Remove cname_lookup from swift UI

Conflicts:

	crowbar_framework/app/views/barclamp/swift/_edit_attributes.html.haml
DE1228 Swift UI  - Swift shows PFS in 2 places, once for swift and once for S3 middleware.  Unify the text for PFS.  Need to ensure all PFS's are changed to read 'pull from source'
Merge pull request #138 from rajinir/pull-req-release-roxy-master-6bd8aa058d09148ed11573a7a35cc27cc8dc0a03

Mesa 1.6.1 to roxy merges