We are really after siteLogo coming from an https domain to avoid mixed content messages. What if instead of "only https sites can specify a siteLogo" it says "siteLogo must be on an https domain". After that, we should be able to get rid of the "only https sites can specify a siteLogo" check - an http site that specifies an https siteLogo will not cause the problem.