Refs #8257. Adding better lockout finding.
Merge branch 'bugfix/8257_splatterplot_lockout' into develop