Try to add signal for stack states
Fix merge conflicts
Fixes to Usergrid bootstrapping w/Core Persistence
Minor cleanup in model pom and remove redundant specification of Jackson 2 version
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Merge pull request #219 from fbicak/two-dot-o

Add Simple User Role Mechanism to Chop Webapp
Revert test breaking change to CpSetup property loading.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Merge pull request #220 from fbicak/two-dot-o

Fix authentication of the default user and Check existence before adding new users
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o-fix-state-transitions
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.
Change in variable name only
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.
Change state of setupstack via signals to prevent it from entering disallowed states
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o-fix-state-transitions
Fix start, stop and reset resources to reflect the changes of stack state transitions
Continue to fix start, stop and reset resources to reflect the changes of stack state transitions