User provider overrides
Merge branch 'master' of github.com:eucalyptus/micro-qa