fixes in case custom folder names are defined before WkProject is called.
manual merge of subtree from wkcmake master to resolve conflict
fixed conflict about wkdoc dir