Convert aggregates testing to use httpretty

This is the first in the series and so contains some setup classes. In
general the original data will not be able to be removed from fakes
until the very end because testing shell depends on a lot of it.

Change-Id: I499fe968923b9452f60c1b2ca50d5749e89827de
blueprint: httpretty-testing
Add unit test for keypair's api

Add unit test for keypair's api in test_shell.py, just for v1.1,
not for v3, because of v3 inherits from v1.1.

Change-Id: Ibbad199449431b328091ef4b5e4b955ffcddc303
Closes-Bug: #1309986
Fixed a typo in a comment

Found using: https://github.com/intgr/topy

Change-Id: I1fba0b8c8e978f286905eeb96ae0a2e47762f413
Fix for "nova help list" command

The output of "nova help list" shows several argument as "Admin Only",
when they are not.
This patch modifies help notes for --ip, --ip6 and --instance-name,
which can be used by regular users.

DocImpact

Change-Id: Iac541ac8e698a27348b437ad53910bd09ea7f257
Closes-Bug: #1295126
Synced jsonutils from oslo-incubator

The sync includes change that drastically enhances performance on Python
2.6 with fresh simplejson library installed.

The latest commit in oslo-incubator:
- 732bdb6297eb9de81667f7713ebcb1ccc2ee45a7

Change-Id: Ib3dc0b713ed90396919feba018772243b3b9c90f
Closes-Bug: 1314129
Fix documentation for config_drive boot parameter

The "config_drive" boot parameter only accepts a Boolean parameter, but
the documentation says otherwise.

Change-Id: I7cbf5aefbd006d8b5425cd8592bacb5d8435b3c9
Closes-Bug: #1314395
Updated from global requirements

Change-Id: I2f3f0b9f09e458eec4eb1e7a3b83e49043a8cb11
Merge "Synced jsonutils from oslo-incubator"
Merge "Fix for "nova help list" command"
Merge "Fix documentation for config_drive boot parameter"
Print message if instance is successfully deleted

Change-Id: I0057a1c906083e1a379a0d15a3c783823f49bf4c
Closes-bug: 1312087
Print message if instance is successfully deleted v3

Also change the message for v1_1.

Change-Id: I35eaf1a7670de79e3b75acaffe7ae13018b0a762
Closes-bug: 1312087
Some Help Messages Missing Translation Support

v1_1/contrib/baremetal is missing translation support for some help
messages. Fix this.

Change-Id: Iea354fef1c7f41361b66ed4e143b3f1f5e562d88
Add mailmap entry

Add mailmap entry for my email address

Change-Id: Ia46c28c86ef3f440556b1b027d2bf0a7f3e721c5
Merge "Convert aggregates testing to use httpretty"
Merge "Print message if instance is successfully deleted v3"
Merge "Add mailmap entry"