Merge "BUG 2221 : Add metering to ShardTransaction actor"