KNOX-311: Parameters not passed to java properly by knoxcli.sh on Ubuntu.
Merge remote branch 'origin/apache-ref/v0.4.0' into baikal-GA-0.4.0