adding correct guava implementation
Fix JSP processing in the two-dot-o branch (USERGRID-209)
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Re-enable tests that we ignored due to JSP problems (see also USERGRID-209).
add queuescope factory
add queuescope factory
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events