Build fails on Ubuntu / OpenJDK without this fix which is needed because of changes in JUnit 4.11. Not sure why builds don't fail on other platforms.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o