Update make_sync_plan CLI facotory

Add the new enable option to the factory. Also add missing arguments for
organization lookup.

Closes #1516