Merge branch 'OHAI-542' into adamed/merge-2014-03-31
Merge branch 'OHAI-550' into adamed/merge-2014-03-31
Merge branch 'OHAI-551' into adamed/merge-2014-03-31
Merge branch 'OHAI-554' into adamed/merge-2014-03-31
Merge branch 'freebsd-version' into adamed/merge-2014-03-31
CHANGELOG update for OHAI-542, OHAI-550, OHAI-551, OHAI-554, OHAI-557
Merge pull request #306 from opscode/adamed/7-stable-merge-2014-03-31

Merge OHAI-542, OHAI-550, OHAI-551, OHAI-554, OHAI-557 into 7-stable