Fix openMP default in config scripts, refs #2622

Original fix was not properly setting the default in the BASH version (so not preventing grabbing of all cores by openMP) and not taking into account previous user value in the CSHELL version