Fix smallish issues in content policy and web request handling
Finished feature 55902080/amo-review-again.