Bug 17901 - "Some settings were changed. Do you want to save them?"
doesn't honor button clicked
Merge branch 'public/7.7' into public/7.8
Merge branch 'public/7.8' into public/7.9