SI-6913 Fixing semantics of Future fallbackTo to be according to docs

Origin: viktorklang@1bbe854
Merge pull request #3181 from heathermiller/issue/6913

SI-6913 Reapplies a lost fix by @viktorklang