Merge "RPM version update / ovs_dpdk rename"