[20180717142017] Bug Fixes

[ddollar]

• #2763 restore --id and --wait to deploy and env unset [@ddollar]
• #2765 proper error for unknown provider, fixes #2764 [@ddollar]
• #2766 give local rack time to start up after install [@ddollar]