MAESTRO-2709 MAESTRO-2690 Fix for Jenkins 1.505+ plus

Added metrics for jenkins testing