Merge pull request #423 from wseyler/dev

[BISERVER-11451]
[BISERVER-10551] Fixed case where editing a newly created connection in the wizard and giving it a new name would fail.