Three changes: 1) you can now override the location of the WAR and portal directory and 2) we now set ElasticSearch heap based on EC2 Instance Type and 3) Tomcat now has a log4j config (again).
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o