Insure that migration 6 retains deleted image property index.

Migration 6 for sqlite deletes the entire table and then recreates it,
however it fails to create the image_properties deleted index.

Fixes bug: 1051123

Change-Id: I4740ff1d5b9ec44067e6af7dd822329105222690
Publish API version 2.1

Fixes bug 1154317.

Change-Id: I1e044539952f649974c757183e9bb2551264850e
Merge "Publish API version 2.1"
Merge "Insure that migration 6 retains deleted image property index."