Tweaking dependencies to aid building against WMF Archiva

Change-Id: Ia4b7750fddb95565cd4065df9f494ee7c098b40d