Revert back changes#689

StuartWheater wants to merge 5 commits into

datashield:v6.3.6-devdatashield/dsBaseClient:v6.3.6-devfrom

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