Fixes search pagination not working.
Fixes RTE enhancement label sometimes being cleared out.
Merge branch 'release/2.0'
Merge branch 'master' of github.com:perfectsense/brightspot-cms