implement Model::unsetConnectionResolver
Minor cs fixes
Merge pull request #4490 from alprs/model-unset-connection-resolver

Implement Model::unsetConnectionResolver
Merge pull request #4484 from GrahamCampbell/4.1-cs

[4.1] Minor CS Fixes
Merge branch '4.1' into 4.2