Manually merge rlm_counter from master.

Includes fixes for VSAs as counters