refs #7261. Unit test confirms false positive bug.
refs #7261. Fix edge case.
refs #7261. Remove unused vars.
Merge remote branch 'origin/bugfix/7261_edge_case'