Merge pull request #52 from shrug/master

Revert "Merge pull request #51 from shrug/master"
(maint) Update the el6 mocks to use the build-tools repo