Changed 'json' to 'JSON'

Change-Id: Idac5c4850f8bb727e17967532ab0b9b9c8e99068
Some edits for help strings

Some edits for neutron help strings as noticed by Lana during review of
this patch:
https://review.openstack.org/#/c/102900/

Change-Id: I4f6cbb3ced85e15c5f4f716aad630090955de31b
Co-Authored-By: Lana Brindley <openstack@lanabrindley.com>
Fix for CLI message of agent disassociation

Modified the CLI output messages

Removed network %s to DHCP agent -> Removed network %s from DHCP agent
Removed Router %s to L3 agent -> Removed router %s from L3 agent

Change-Id: I2df928b5e2edecf1aaf5ee15f95e51a37872239a
Add MacAddressInUseClient exception handling

Nova needs a specific client exception defined for the server's
MacAddressInUse exception when allocating ports so it can handle the
exception properly, otherwise the NeutronClientException with a 409 can
be confused with other errors.

Partial-Bug: #1347778

Change-Id: Ia02dbc8fe32a43adeb229e3b640b9b33ec0dd6c7
Add a new timeout option to set the HTTP Timeout

Adds a new --timeout option and check to the env
var OS_NETWORK_TIMEOUT to set the HTTP timeout used
for the request to the Neutron backend.

DocImpact

Closes-Bug: #1338932
Change-Id: I0d9687e671f68c4845af2439abfe581c6dcf020c
Remove strict checking of encryption type

The server may accept a different set of encryption-algorithm
dependending on the service plugin that is being used.  Without a
better mechanism for communicating this to the client, we decided at
the Atlanta summit to just remove it.

Change-Id: I658fe00281e9cbd018095969d80f5c09aca6cd38
Closes-Bug: #1322659
Merge "Fix for CLI message of agent disassociation"
Merge "Add a new timeout option to set the HTTP Timeout"
Merge "Remove strict checking of encryption type"
Merge "Add MacAddressInUseClient exception handling"
Merge "Changed 'json' to 'JSON'"
Merge "Some edits for help strings"