Make links for HTTPS enabled sites use schema independent links (MBS-5789)
Remove a line left over from testing
Address review comments
Merge remote-tracking branch 'nikki/mbs-5789' into beta