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

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


 .../keystone/templates/default/keystone.conf.erb   |    4 ----
 1 file changed, 4 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy