Merge branch...

Merge branch '6393-websites-php-version-gets-accidentally-altered-by-admin-if-websites-php-version-is-client_id-0' into 'develop'

Resolve "Websites php version gets (accidentally) altered by admin if websites php version is client_id != 0"

Closes #6393

See merge request !1657