Changed 'collection_source' to 'datastore'
Merge remote-tracking branch 'origin/1092_es_mapping' into 805_es_pages