KNOX-396 gateway.sh and ldap.sh status commands incorrect
Merge remote-tracking branch 'origin/apache-ref/master' into champlain