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

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


 .../cinder/templates/default/cinder.conf.erb       |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy