don't clear the database dicts in the tearDown method

This is superfluous as the two dicts (self.engines and
self.test_databases) are re-initialised during setUp anyway and aren't
used in between

Change-Id: Icafa9bdf3b0193f31752e6104ecac0e49476c812
Ensure service's servicegroup API is created first.

We want to make sure to create the servicegroup API instance early,
before creating other things such as the manager, that will also
create a servicegroup API instance.  Internally, the servicegroup
only allocates a single instance of the driver API and we want to
make sure that the service's value of db_allowed is there when
it gets created. For that to happen, when the service class creates
a servicegroup API instance, it needs to be the first thing to do so.

Part of bp no-db-compute.

Change-Id: I41df39d34c4920fcbfcd50c8f0344ee1dd5547d1
Fixed nova-manage argument parsing error

In the dictionary CATEGORIES of file nova-manage, both 'flavor'
and 'instance_type' refer to InstanceTypeCommands, so the category
would be handled twice by add_command_parsers(). It would mess the
arguments if a command category is handled more than once by
function add_command_parsers().
Added a check to avoid the mess.

Change-Id: I7a314a9b389b3dea848a7111cedfc762bbb6b30e
Fixes: bug #1098733
Adds SSL support for API server.

Part of code in test for accessing with ipv6 and part of ssl
socket wrapping developed by Davanum Srinivas.
Original patch could be found here:
https://review.openstack.org/#/c/19559

DocImpact

Fixes bug 869884.

Change-Id: I6d60df77c3fb49552e597f94abae7f4d6f54044d
Merge "don't clear the database dicts in the tearDown method"
Merge "Adds SSL support for API server."
Merge "Fixed nova-manage argument parsing error"
Merge "Ensure service's servicegroup API is created first."
Merge remote-tracking branch 'citrix/master' into build-temp