WELD-1501 Make WELD-1480 configurable from the application
Make it possible for an integrator to enable non-portable mode
Upgrade Weld API to 2.1.Beta2