Set collection_datastore=elasticsearch for indexing / bdd tests as intended.
Make columns an ordered dict so that collection tables work properly with elasticsearch backend.
Merge remote-tracking branch 'origin/master' into pages-from-elasticsearch

Conflicts:
	src/encoded/tests/test_indexing.py