CLC-3010 CLC-3317 Handle whitespace PNP_FLAG values
Merge pull request #2224 from raydavis/raywip

CLC-3010 CLC-3317 Handle whitespace PNP_FLAG