Fix alias validation regex
Merge pull request #2965 from kraman/alias_regex_fix

Merged by openshift-bot
Rename migrate to upgrade in code

Trello: https://trello.com/c/1KV8NmDJ (online_runtime_319)
Merge pull request #2967 from pmorie/dev/os_migrations

Merged by openshift-bot