merges :capabilities
2 merge :capabilities
Merge branch '2.6' of github.com:abiquo/jclouds-labs into hp