Bumped virtualbox base box to 11.12.4
Bumping berkshelf version due to berkshelf opscode redirect issue 1252
Updated Berksfile to use chef_api
Constraining minitest-handler version
Fixing merge conflict
Merge branch 'master' into 67796-bump-base-vbox
Merge pull request #18 from daptiv/67796-bump-base-vbox

67796 bump base vbox