KNOX-404: GATEWAY_HOME/conf needs to be added to gateway server classpath
Merge remote-tracking branch 'origin/apache-ref/master' into champlain