sort postfix templates
(cherry picked from commit 4508615)

[r=zolotov]
Emmet: more diagnostic info
(cherry picked from commit 1f9ab71)
EA-55259
(cherry picked from commit 33e8c78)
[r=enDal]
Emmet: reformat surrounded block
(cherry picked from commit 5898229)
[r=enDal]
Mac keymap: bind rerun tests on valid shortcut
(cherry picked from commit 8ac22e1)

[r=enDal]
EA-55456
(cherry picked from commit 11bc248)
[r=peter]