Upgrade to Hadoop 2.1.0-beta

* upgrade master from hadoop 2.0.4 to hadoop 2.1.0-beta
* place storm logs into container directory
* respect JAVA_HOME per env