Merge "rmnetctl: Changes for flow handles"