Additional changes to v6.3.6-dev#651

StuartWheater wants to merge 6 commits intodatashield:v6.3.6-devdatashield/dsBaseClient:v6.3.6-devfrom

StuartWheater:v6.3.6-devStuartWheater/dsBaseClient:v6.3.6-devCopy head branch name to clipboard