ADEN-1199 Fix for HubsV2 and added test case for sub-hubs
Merge pull request #3797 from Wikia/release-228-aden-1199-part-2

Release 228 aden 1199 part 2