fix(data): correctly handle HttpOptions when provided

[cam-m]

PR Checklist

Please check if your PR fulfills the following requirements:

• The commit message follows our guidelines: https://github.com/ngrx/platform/blob/master/CONTRIBUTING.md#commit
• Tests for the changes have been added (for bug fixes / features)
• Documentation has been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

[x] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[ ] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] Other... Please describe:

What is the current behavior?

Http Options are incorrectly merged when users extend the DefaultDataService and override a method, adding http options to the execute call.

Closes #3794

What is the new behavior?

Http Options are correctly merged

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

[netlify]

✅ Deploy Preview for ngrx-io canceled.

Built without sensitive environment variables

Name	Link
🔨 Latest commit	9c104d2
🔍 Latest deploy log	https://app.netlify.com/sites/ngrx-io/deploys/64113a6ffecc33000855d012

[timdeschryver]

Could you resolve the merge conflicts please

[cam-m]

done

[timdeschryver]

I updated the description so it closes the correct issue.
I also noticed there are many commits within this PR, could you rebase those so it only includes the commit with the changes please?

[cam-m]

I updated the description so it closes the correct issue. I also noticed there are many commits within this PR, could you rebase those so it only includes the commit with the changes please?

Apologies, reused my branch from the original work for this, still new to PRs. Should be ok now, thanks!