more robust handling if system permissions go wrong
remove duplicate cc_config
Merge branch '2.3.x' into devel