Merge trunk 
Updating names for APIRouter in CLI and CLI tests
merge trunk
Merging lp:~salvatore-orlando/quantum/bug834449

Fix for Bug #834449
merge cisco consolidated plugin changes
Merging from lp:quantum
Merging from Cisco branch
Merging Sumit's changes including fixes for multinic support, and CLI module for working with extensions.
Merge trunk
Now re-submitting admin credentials if token expires
Updating CLI for not using Cheetah anymore.
Now using a mechanism based on Python built-in templates.
Merging lo:~salvatore-orlando/quantum/quantum-api-auth

Implements blueprint: Quantum API Auth (Keystone Integration) 
https://blueprints.launchpad.net/quantum/+spec/quantum-api-auth
Merging latest from lp:quantum
merge sumit's branch for lp837752
Merge trunk
merge salv's no-cheetah CLI branch lp 842190
merge tyler's unit tests for cisco plugin changes lp845140
Add rfc.sh to help with gerrit workflow.

Change-Id: I1672ec098ea190a5068df941e48f140409b83e66
Add code-coverage support to run_tests.sh (lp860160)

Change-Id: I404ba58ea882123b8c6669ea32923fa626b27de5
Add .gitreview config file for gerrit.

The CI team is developing a new tool, git-review:

  https://github.com/openstack-ci/git-review

which is intendend to replace rfc.sh.  This adds a .gitreview file
so that it can automatically determine the canonical gerrit location
for the repository when first run.  Later, rfc.sh will be updated to
indicate it is deprecated, and then eventually removed.

Change-Id: I49edfa303671de58f54eae4e1d7c27916c41dda7
blueprint quantum-packaging

Change-Id: Ica19170540b06ecddb0fbb6d340ee7a6819c1708
Fix for Bug #888820 - pip-requires file support for plugins

Change-Id: I6e0833ec0c875ec38db419a88fd6c2db02142f08