On Behalf of Jason Morrison (jasonm): when using desired capabilities and chrome options together, attempt to merge rather than squash.

Fixes Issue #7389