Merge "Bug 6193 - Change in length of DatapathId of a switch"