part 1 of cherry-pick: 63eaf915e4649cae3ee76b7fa9f4707a9d487451
part 2 of cherry-pick: 348ca3e0b5742ac6162366bec85c96caedcd87c1
Merge branch 'master' into dev

Conflicts:
	repository/Tode-Client-Common.package/TDShell.class/instance/executeInstallServer..st
picked wrong side of merge
Merge branch 'master' into dev