Fixes for initial install to properly use require.config.js
Merge