Adding ConfigurationForm tests and correction to reset the isServerManager check upon configuration change
Fixing merge conflict