Fix problem with nova --version

Update to latest openstack.common.version.py and fix __init__.py
to get "nova --version" to work properly again

Fixes LP# 1165325

Change-Id: I29e54cd4cf79759407f3967518e9be575abd994a
Correct a unit test failure that crept into trunk

At some point, the "nova list" command started returning an
empty table when no results were obtained, while the
tests.test_shell.ShellTest.test_password test was expecting
a single newline.  Whichever commit caused this change in
behavior somehow made it past the gate without forcing the
test to be updated.

This commit fixes the issue by changing the output that
test_shell.test_password is expecting.

Fixes bug 1166464.

Change-Id: I57636b4a1e525c440925caba0bbb51bbcd94b080
Fixing shell command 'service-disable' description

Fixes: bug #1166217
Change-Id: I0ba609750551540f9cd91492191b222961e99fb1
Merge "Fix problem with nova --version"