Additional path fixes for generator#1650

chasefleming merged 2 commits into

masteronflow/flow-cli:masterfrom

cf/gen-path-fixesonflow/flow-cli:cf/gen-path-fixesCopy head branch name to clipboard