Fixing problem when adding categories in sessions -refs #5962
Minor indentation corrections
minor spaces corrections
Minor indentation corrections
manual merge
manual merge