Fixes #4954 - Fixing several problems in the sync plan API
Merge pull request #3918 from daviddavis/temp/20140329072141

Fixes #4954 - Fixing several problems in the sync plan API