Rip out Hystrix entirely and I plan to put it back in at a lower level (wrapping each Astyanax mutate and query call).
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Fix for regressions in CollectionsIT test.
Move REST tier from Codehaus Jackson 1 to FasterXML Jackson 2, move Java SDK to Jackson 2.3.1 and make REST tests use the latest Java SDK rather than the old org.usergrid 0.3 one.
Default to 1 thread concurrency for tests until OOM issues worked out.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into DPS-1102_properties-consolidation

# By Dave Johnson
# Via Dave Johnson
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  Default to 1 thread concurrency for tests until OOM issues worked out.
  Move REST tier from Codehaus Jackson 1 to FasterXML Jackson 2, move Java SDK to Jackson 2.3.1 and make REST tests use the latest Java SDK rather than the old org.usergrid 0.3 one.
  Fix for regressions in CollectionsIT test.
  Rip out Hystrix entirely and I plan to put it back in at a lower level (wrapping each Astyanax mutate and query call).