Bug 1065977 - Uplift recent PSL changes to the release branches. a=lmandel