t286 - Remove module origin categorization for gateways
Merge remote branch 'origin/7.x-3.0-qa' into 7.x-3.0-qa