sleep after exception
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
remove all synchronized blocks
Upgrades yourkit script version
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Fixes data dir for info
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Moved from /tmp to /mnt to survive restart
Adds c3.xlarge instance config options
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o

Conflicts:
	stack/awscluster/src/main/dist/init_instance/init_rest_server.sh