refs #8689. Fix l2q usage and documentation.
Merge remote branch 'origin/feature/8689_l2q_issues'