Updated index structure for lightblue issue #35
Merge remote-tracking branch 'origin/master'

Conflicts:
	functional/metadata/test-metadata-update-index.json