HBASE-2217 VM OPTS for shell only
Merge remote-tracking branch 'remotes/origin/0.94' into 0.94