Merge "Include JMX Counters and resetTransactionCounters"