Fix "glance add" parsing of "copy_from" option.

copy_from was ignored which resulted in "glance add" attempting to read from
stdout.

Fixes bug 1167899

Change-Id: I57fd85f7bb655bef69222d4fdf6b8274088ca827
Merge "Fix "glance add" parsing of "copy_from" option."
Sync with oslo-incubator copy of setup.py and version.py

Keep up with the changes to the master copy

Change-Id: Id938cc593a61b56a06c05069034bd958fc6aa8b3