Fix import for vumi#574.
Merge branch 'develop' into develop-frontend
Merge branch 'develop-frontend' into feature/issue-411-lookup-needs-to-provide-the-same-comparator-types-as-backbone
Merge branch 'develop-frontend' into feature/issue-412-lookup-keys-need-to-be-returned-in-the-correct-order