Fix merge turd.
Fix merge turd.

randomstatistic/metrics,gburton1/metrics,ohr/metrics,tempredirect/metrics,slachiewicz/metrics,mnuessler/metrics,timezra/metrics,valery1707/dropwizard-metrics,mspiegel/metrics,unitsofmeasurement/metrics,infusionsoft/yammer-metrics,bentatham/metrics,maciej/metrics-scala,kevintvh/metrics,ind9/metrics,scullxbones/metrics-scala,erikvanoosten/metrics-scala,wfxiang08/metrics,cirrus-dev/metrics,jplock/metrics,egymgmbh/metrics,fcrepo4-archive/metrics,ChetnaChaudhari/metrics,mt0803/metrics,gburton1/metrics,slovdahl/metrics,infusionsoft/yammer-metrics,mattnelson/metrics,dropwizard/metrics,mtakaki/metrics,fcrepo4-archive/metrics,Banno/metrics,signalfx/metrics,thelastpickle/metrics,dropwizard/metrics,jasw/metrics,AltitudeDigital/metrics,dropwizard/metrics,mveitas/metrics,chenxianghua2014/metrics,mveitas/metrics,wickedshimmy/metrics-scala,rexren/metrics