Improved svc.SetCharm and unit.SetCharmURL, added more tests
Merge pull request #1113 from dimitern/lp-1301996-settings-lost-after-upgrade-charm

Improved svc.SetCharm and unit.SetCharmURL, added more tests

This is an attempt to fix issues like http://pad.lv/1301996