Merging the Cisco branch.
Merging from Sumit's branch, import ordering related changes.
Merge trunk
Sorted "ghost" conflict in etc/quantum.conf
Syncing with Cisco extensions branch.
Merge from Cisco branch and changes to scheduler/vif-driver.
Merging from Sumit's branch, changes to VIF-driver and Scheduler; extension action names have been changed in response to Salvatore's review comments in the extensions branch review.
merge cisco extensions branch
Merging from quantum.
Addressing comments from Dan

Also solved issue with output from plug_iface and unplug_iface
merge salvatore's new cli code
Merging from lp:quantum
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.