BZ-12002 changed meters order by UtilityType and Name
Merge remote-tracking branch 'origin/master'