fix and enable media tags and media sets solr delta imports
Merge branch 'master' into RELEASE_20140325