Mesa 1.6.1 to roxy merge


 chef/cookbooks/mysql/attributes/server.rb          |    4 ++--
 crowbar_framework/app/models/database_service.rb   |   11 +++++------
 .../barclamp/database/_edit_attributes.html.haml   |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

Crowbar-Pull-ID: 1899aaa0c821627644579305f58db1d701570a1d

Crowbar-Release: roxy