Merge pull request #18 from craiganderson/stable/havana

Merge Master into Stable/havana to support swift keystone auth for CCP R1
Revert "Merge Master into Stable/havana to support swift keystone auth for CCP R1"
Merge pull request #19 from att-cloud/revert-18-stable/havana

Revert "Merge Master into Stable/havana to support