GPII-434: Improved documentation following review
GPII-434: Removed spurious "root" definition in server following review
Merge branch 'GPII-434'