Update setup.md
Test mappings key being null still causes appropriate configuration changes
Add tests to cover no mappings for serializer enabled type
Merge remote-tracking branch 'upstream/pr/682' into 3.0.x