(CDAP-512) Service system metrics

Yeah sorry. Did this so that ``Spark`` could run as "s" and ``Service``s would be "u". 

Rohit has already made this change to his PR, so i'll revert this change and let him do it.