Squashed 'plugin/floo/common/' changes from 7237db4..bc039ff

bc039ff Simpler reactor.block
7cdbfdc Merge commit '9e943d095f7cf404217cf90f9f5367716dd8849a'
e415ce1 Send whole patch result to apply_patch, not just offsets, lengths, and text
ffe51b6 More progress
f4b6a10 Merge commit '95366d9ba5a37e124f2cfbfa2ba3e55bad1097fa' into abstraction
e808f26 Merge common fixes.
9fa14bc Deal with new workspace URLs.
2269555 Don't explode if we can't read this.

git-subtree-dir: plugin/floo/common
git-subtree-split: bc039ff5e966d1e3896d89086bfe63ca512f91bf
Merge common. Fix conflict.