Merge "Refactor the vyos_vrouter to adopt VNF abstraction"