Merge remote-tracking branch 'origin/staging' into...

Merge remote-tracking branch 'origin/staging' into OCF1-remove-deprecated-documentation-of-curl-testing