Fixes WhiteHat parsing tests by switching "/" in for null
Merge branch '2.1M2' into qa