On one of my wikifarms I only have one local patch to MediaWiki core left. I'm hoping to have that merged as well, so let me bring this to your attention: https://gerrit.wikimedia.org/r/#/c/98078/
On a related note, I'm using html templates and I am in need of a way to deliver them with resource loader. Max Semenik has already made a patch for that, so please have a look at that too: https://gerrit.wikimedia.org/r/#/c/111250/
-Niklas