merge master and fix SDN chaining unit test