Upping surefire version to 2.7
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o

Conflicts:
	stack/pom.xml
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into two-dot-o
[APIBAAS-1362]Modify script to pull war and init scripts separately
[APIBAAS-1362]Remove war file from the assembly artifact and have maven upload them separately
[APIBAAS-1362]Have the update script only update the war file
[APIBAAS-1362]Update CF scripts to reference new names/paths for init tarball and ROOT.war
Temp commit, overwrite
Moved opscenter into it's own node
Merge remote-tracking branch 'ryan/APIBAAS-1362' into ryan-integration
Changes from merging Ryan's changes in.  Now auto migrates and runs system setup
Merge branch 'key-row-sharding' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into key-row-sharding