Fix for EntityManagerIT testCorrectType() test, and some compilation errors in other modules.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o