CLC-1386 QA branch fix incorrect migration ID and bring in Eli auth fix

Conflicts:

	db/migrate/2013022123590000_update_eli_uid.rb
	versions/previous_release_db_schema.txt