Make sure DataPoints are marked up as being run on the cloud.

[#56443410]
Merge remote-tracking branch 'remotes/origin/develop' into PAT-EC2