Merge pull request #334 from kraman/origin_fixes

Merged by openshift-bot
Automatic commit of package [rhc] release [1.6.4-1].
Card #239: Added support to alias creation and deletion and SSL certificate upload to the CLI
Minor bug fixes and typos
Minor bug fixes and typos
Minor bug fixes
Merge pull request #335 from fabianofranz/dev/ffranz/ssl

Merged by openshift-bot
Automatic commit of package [rhc] release [1.6.5-1].
http_proxy ENV variable does not have to set protocol.

Bug 924863
Rename 'MegaShift' to 'Silver'
Merge pull request #336 from jtharris/bugs/BZ924863

http_proxy ENV variable does not have to set protocol.
Merge remote-tracking branch 'origin/master' into update_to_new_plan_values
Bug 924594 - Any combination of help should never trigger wizard behavior
Automatic commit of package [rhc] release [1.6.6-1].
Merge pull request #338 from smarterclayton/bug_924594_help_shouldnt_trigger_wizard

Merged by openshift-bot
Fix Bug 920059

* When the public key does not exist, put the error message for debugging, not to STDERR.
* Instead, warn the user when the public key does not exist--only once.
* Includes a corresponding change to the spec, since there is no output to STDERR.
Merge pull request #340 from BanzaiMan/dev/hasari/bz920059

Merged by openshift-bot
Bug 924142 - Safely handle empty sshkey files

Use IO.read to avoid File.gets == nil, and properly stub IO.read when FakeFS is activated
Wizard spec should be on FakeFS
Merge pull request #337 from smarterclayton/update_to_new_plan_values

Merged by openshift-bot