KNOX-410 - set topology name back to original value after deploying _default topology
Merge remote-tracking branch 'origin/apache-ref/master' into champlain