KNOX-402: New GatewayService - TopologyService
Merge remote-tracking branch 'origin/apache-ref/master' into champlain