[KRACOEUS-8420][KRACOEUS-8114][KRACOEUS-8275][KRACOEUS-8424]  Workaround fixes to fix/re-fix these jiras
Merge pull request #1190 from bsmith83/protocolnum

[KRACOEUS-8420][KRACOEUS-8114][KRACOEUS-8275][KRACOEUS-8424]  Workaround...