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
CLC-1368 Addendum - update schema.rb and account for dbs that don't have an Eli
Merge pull request #731 from ctweney/clc-1386-qa

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