updates to use forked lsync, bring in upstream changes