add padding to DPID for OVS
fix typos in previous
Merge branch 'master' into tim_dev