back port of forwarding rule enhancements from 2014.05 branch