Second update in upgrading to MediaWiki 1.23

* This new patch may need to remove some wikia change due to it either being added or removed.

Change-Id: I054f1ace82173cd2ee5fe2df3a7a000039f2da65