Reverted Hadoop test update (blocks following tests)
Makefile: minor boost-related fix
Merge branch 'master' into strict-ssl