TOOLSDOC-436: User Guide - QE feedback incorp in server chp

Apply to master and 4.1.x