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

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


 .../templates/default/nova-dashboard.conf.suse.erb |    1 -
 1 file changed, 1 deletion(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy