Use ServiceCatalog.factory, the object has no __init__

Fixes LP bug #1199281

Change-Id: Iba4b3fd8ad2e6fe054ed705d8990c13dc5a13430
Raise key length defaults

Extend RSA keylength to 2048 bits by default,
as the previous default of 1024 bit is considered
weak since 12/31/2010.

Also unify the message_md to the openssl builtin
default.

Fixes bug 1103002

Change-Id: I619fc32b62beab4458ee6f21bf8dc7499fe400d7
Merge " Cleanup docstrings " from keystone/common/cms.py

In an attempt to unify both implementations in order to
be able to remove one of the duplicated ones, merge the
changes from this commit in keystone:

    Author: Dolph Mathews <dolph.mathews@gmail.com>
    Date:   Fri May 24 11:36:44 2013 -0500

    Cleanup docstrings (flake8 H401, H402, H403, H404)

Change-Id: Ib23c9ab5066cfdcdda4e07cd30fa8f6ff47949bd
Update openstack-common.conf format

Change-Id: I78528bf7055b6975a642e1f2f3264e94f5a4885b
Add discover to test-requirements.

Apparently this was always supposed to be required for py26 tests with
testresources however only recently does a newer version actually fail
without it.

Change-Id: I9c7bc83d75a964152ad5772554f9693706a2a2d4
Merge "Update openstack-common.conf format"
Merge "Merge " Cleanup docstrings " from keystone/common/cms.py"
Merge "Raise key length defaults"
Merge "Use ServiceCatalog.factory, the object has no __init__"