Improve normalisation logic

Invalid metric names will crash the metrics reporter, so let’s avoid
those
Extract out Metriks.meter.mark

This allows us to ensure that we don’t send invalid metric names.
Return env vars according to secure_env_enabled? logic
Fix specs
Merge branch 'master' into ha-feature-additional-metrics

Conflicts:
	lib/travis/travis_yml_stats.rb