Merge pull request #11 from MirantisDellCrowbar/bug/DCB-102/pebbles/master

Update terminate_connection method's signature to grizzly
Merge pull request #14 from crowbar/release/pebbles/master

Release/pebbles/master
cinder required python-swiftclient
use BarclampLibrary::Barclamp::Inventory::Disk for collect disks and add pfs_deps
Merge pull request #15 from crowbar/release/pebbles/master

Release/pebbles/master
Merge branch 'release/pebbles/master' into bug/DCB-124/pebbles/master
webui: Add back javascript to hide/show eqlx parameters

This got dropped by accident in 74567ca.
The auth_token middleware has beed moved to keystoneclient

Using keystone.middleware.auth_token, which nowadays is just a compatibilty
wrapper for keystoneclient.middleware.auth_token, breaks in setups where
keystone is installed on a different node. Using keystoneclient instead should
work in all cases as it will be pulled in via package dependencies.
Merge pull request #34 from MirantisDellCrowbar/bug/DCB-124/pebbles/master

add missing pips when pfs enabled
Merge pull request #33 from vuntz/eqlx-javascript

webui: Add back javascript to hide/show eqlx parameters
Merge pull request #35 from rhafer/pull-req-release-pebbles-master-197808408153b82a03525bc760b96ecadfb330c3

The keystone auth_token middleware has been move to keystoneclient [2/4]
Use new protocol attribute from keystone barclamp
Merge pull request #36 from vuntz/keystone-protocol-attribute

Add non-configurable attribute for http/https use in keystone [3/7]
Fix merge typo: Its Cinder volumes, not Nova Volumes