KNOX-406: Add provider name to test topologies to prevent intermittent test failures
Merge remote-tracking branch 'origin/apache-ref/master' into champlain