Merge ofswitch, ofnet and ofertie-ncl