Issue #100: Fix required layer field setting changes not being saved.
Clean up.
Merge branch '#100/fix-required-layer-field-settings-not-being-saved' into develop