Minor fixes to additional metric labels

Change-Id: Ia2ad1b28c7c1fd61effaf46d04f97e004a93be15
Signed-off-by: lavado <glavado@whitestack.com>
9 files changed