Merge branch 'test-tos-hash' into travis-hosts-boulder