Point Berksfile to master branches
Update keystone reference after nova attr change
Merge pull request #175 from claco/point-berks-to-master

Merged automatically by jenkins after successful build test