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
Make help description of rescue/unrescue more useful

The docstring was not helping users in understanding
what the command does.

Change-Id: I858a43157c582067992cb80080ed440d6aba3ac3
Deprecate num-instances in favor of min/max count

For 'nova boot', num_instances only set max_count, which will try to
launch up to max_count instances. But sometimes users want to either
launch min_count instances or nothing. So deprecate --num-instances
and use --min-count and --max-count instead.

DocImpact: deprecate '--num-instances' for 'nova boot'

Change-Id: If0088aef554a528258799b22c6e793541474cb0d
Closes-bug: #1309244
Print message if instance is successfully deleted v3

Also change the message for v1_1.

Change-Id: I35eaf1a7670de79e3b75acaffe7ae13018b0a762
Closes-bug: 1312087
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"
Merge "Make help description of rescue/unrescue more useful"
Merge "Deprecate num-instances in favor of min/max count"