Tweaks to use includeme and mozsvc logging & metrics