Import tweaks for NAS python/2.7.6 build.
Merge pull request #1807 from setowns1/bug

Import tweaks for NAS python/2.7.6 build.