LDAP: document enabled_emulation

 - Add documentation to the Configuration page for enabled_emulation
 - Fix a comment about the default value used for enabled_emulation

Change-Id: I3fdb4e9ecfe8bd43f8046d6e99a18941bc938487
Closes-Bug: #1275907
List trusts, incorrect self link.

Fix the base_url method in trust controller to build off
of the one in V3 controller.

Closes-Bug: #1279398

Change-Id: If9b3114c9b2b9978237988fa3b52e0bede783057
Add lockfile and kombu as requirements for keystone

Sphinx is failing to build because we do not list
lockfile or kombu in either requirements file.

Change-Id: Ic31870c283a18958cd61e51bc56ed771732ee753
Use WebOb directly in ec2_token middleware

When https://review.openstack.org/#/c/71494/ was introduced, it
forgot to change ec2_token as well. This caused errors when building
docs.

Change-Id: I051519c815ed5ae60ec07203073131db1e031e10
Treat sphinx warnings as errors

Change-Id: I003c9a210704c12423dc038f442df3913d133a6a
Set sensible default for keystone's paste

The https://review.openstack.org/#/c/66247/ change introduced
the requirement to set config_file before keystone would start
up. Restore the old setting as default to allow a smooth
transition for users.

Change-Id: I935c5144728d04c59abaee9a515e249ef0d24477
Merge "Add lockfile and kombu as requirements for keystone"
Merge "Use WebOb directly in ec2_token middleware"
Merge "Treat sphinx warnings as errors"
Merge "Set sensible default for keystone's paste"
Merge "LDAP: document enabled_emulation"
Merge "List trusts, incorrect self link."