Pr/3098

I've fixed up https://github.com/silverstripe/silverstripe-framework/pull/3098, rebased it, squashed the commits, fixed the test cases, and made a few API suggestions.
This can be written as `$cookies ?: $this->cookies` which is cleaner (same for the other ternary above)