Changed placeholder migration file names to real migration numbers.  Ran prep_migrations script.  Removed migration that removed host_backup table since this was still being used.
Merge branch '1.21-candidate' of github.com:lbrackspace/atlas-lb into 1.21-candidate