don't create cf_null in masterfiles, as it will interfere with any VCS working directory there. cf_null is kept for 3.4 compatibility, but should be removed with 3.7 or later
Merge pull request #153 from estenberg/cleanup/cf_null

cf_null cleanup