Merge "Add manual ovs upgrade script for workaround ovs upgrade issue" into stable...