[20171211185049] Reduced Parameter Count and Env Fixes

[ddollar]

• #2407 Fix for new environment variables set before new build. [@radekl]
• #2408 Use exports to reduce parameter count [@ddollar]