Fix row reorder to work again.
This fixes the problem: KeyError: Index u'null' is missing from the catalog.
Merge remote-tracking branch 'origin/master' into ree-build-resources-allin