Change 10017

Norman Morse
minor fixes for p4convert
2 edited 1 added 0 deleted
Tip: Use n and p to cycle through the changes.