Merge "Update opendaylight version to oxygen" into stable/fraser