Sync models.Console* with migrations.

Blueprint: db-sync-models-with-migrations

Change-Id: I2cceab6484b6d69b3f1aa1492e49d76a765b758d
Merge "Sync models.Console* with migrations."
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp