fixes #4906 - respect organization for sync plans
Merge pull request #3904 from jlsherrill/sync_plans

fixes #4906 - respect organization for sync plans