Configuraiton changes to not set null and use undefined instead

Jira Issue: WP-961