Accept µs in addition to us for microseconds to satisfy Go 1.4 incompatibility
Fix locks around counters in channel_group_connector_test for Go 1.4 compatibility