Mesa 1.6.1 to roxy merges 


 chef/data_bags/crowbar/bc-template-swift.json      |    2 +-
 crowbar.yml                                        |    2 +-
 .../barclamp/swift/_edit_attributes.html.haml      |   17 ++++-------------
 3 files changed, 6 insertions(+), 15 deletions(-)

Crowbar-Pull-ID: 6bd8aa058d09148ed11573a7a35cc27cc8dc0a03

Crowbar-Release: roxy