Adopt ApiConventionsTest to MediaWiki 1.25 API module changes

Also minor style enhancements

Change-Id: I69008ed8aebb819bd536d3e9e79d41cc64d3495d