Merge remote-tracking branch 'origin/bugfix/5693_revert_custom_color_map'
Merge remote branch 'origin/feature/7398_NonThrowingAtom'
Refs #7434. Fixing warnings.
Merge branch 'bugfix/7434_intel_warnings_panel_plugins' into develop