Merge of Latest Pebble commits into Roxy [1/13]

The changes here are the latest Pebbles commits into Roxy, thus in essence bring roxy in sync with Pebbles. 


 chef/cookbooks/nova/recipes/config.rb              |    2 --
 .../cookbooks/nova/templates/default/nova.conf.erb |    4 ++--
 crowbar_framework/app/models/nova_service.rb       |   11 +++++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy