Display portal links only if the flag is activated (bug 917698)
Merge pull request #1154 from davidbgk/917698-hiding-portal-link

Display portal links only if the flag is activated (bug 917698)
fix upsell for region exclusions again (bug 909532)
Fix tests altering databases for jenkins