upgrader minor bugfixes
Merge branch '343-instance-upgrader' into develop