Add metrics-jersey support
Merge branch 'remote_master-metrics-jersey'