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

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


 chef/cookbooks/ntp/recipes/default.rb |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy