Merge remote-tracking branch 'origin/nicholas.hulston/add-http.route-tags' into nicholas.hulston/add-http.route-tags

# Conflicts:
#	src/trace/trigger.spec.ts

Author: nhulston