Align with small updates to base v6.3.6#688

StuartWheater wants to merge 3 commits into

datashield:v6.3.6-dev-feat/standardise-dfdatashield/dsBaseClient:v6.3.6-dev-feat/standardise-dffrom

StuartWheater:v6.3.6-dev-feat/standardise-dfStuartWheater/dsBaseClient:v6.3.6-dev-feat/standardise-dfCopy head branch name to clipboard