Merge pull request #108 from jcannava/grizzly

Merged automatically by jenkins after successful build test
changing default.rb to include setup and keystone-api and updating metadata. Fixes allinone role errors