fix content settings not being properly evaluated/stored
Merge pull request #5860 from Montellese/fix_content_settings_for_real

fix content settings not being properly evaluated/stored