Merge branch 'unit-test-jdk7' of https://github.com/rankinc/btm into unit-test-jdk7
Merge branch 'unit-test-jdk7' of https://github.com/rankinc/btm into unit-test-jdk7