Updated mediawiki/extensions
Project: mediawiki/extensions/Wikibase  4336ac890bee924ddc173d865b5157a47c88bd7d

Fix conflict between merged commits

Change-Id: I0489dec2719f02af8927250e078c8ad6f527a970