Project: usergrid
Issue USERGRID-760: Merge master to two-dot-o branches & rewrite tests to use new framework
There's one new test from master that needs to be rewritten using the new framework: ApplicationResourceIT.applicationCollectionWithAppToken()
Story points: 2