Merge branch 'issue802' into 1.7.x
create missing folders when groupNameMappingFile is located in a location which doesn't exist yet
fix merge conflicts