The merge had broken the unit-test build due to semantically incorrect merge. Fixed.
Merge branch 'nwa_detensor' into nwpdsExperimental
Added a static flag to SConstruct to force static build. DO NOT MERGE BACK INTO MAINSTREAM.

I have removed the AddOns/Parse node from the build completely, because this
causes problems with static build on RedHat.
This is a known issue. See:
www.daylight.com/dayhtml/doc/release_notes/readme_v483_linux.html