KNOX-346: The knox-env.sh script should prefer JAVA_HOME over java on path
Contributed by svelpula at hortonworks dot com
Merge remote branch 'origin/apache-ref/v0.4.0' into baikal-GA-0.4.0