BRANCH 4.2-105: more work on rsync integration
Merge branch '4.2-105' of https://github.com/southpawtech/TACTIC-DEV into 4.2-105