Bug 979686 - Fix the non-(ARM|x86|x86_64) desktop build. r=kang
Bug 979995 - Fix reference to non-existing element and re-enable test. r=surkov
Bug 980837 - Remove trailing spaces from PSL. r=gerv
Bug 980841 - Add desa.id to PSL. r=gerv