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

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


 .../barclamp/libraries/barclamp_library.rb         |   20 +++++++++-----------
 chef/cookbooks/barclamp/libraries/nic.rb           |    8 ++++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

Crowbar-Pull-ID: 17620546f850dd64dddb20c9c812824cc5589804

Crowbar-Release: roxy