JBQA-8676: User Guide - incorp QE feedback

Apply to master and 4.1.x