General updates and reworkings#618

StuartWheater merged 13 commits intodatashield:v6.3.5-devdatashield/dsBaseClient:v6.3.5-devfrom

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