Don't defer indexing on 'content_type' or 'interfaces'.

We may need next-request query of those indexes in some scenarious, such
as uploading a new image and then locating it in a picker widget.
Merge branch 'master' into feature.deform2