Updated OpenStack role lists to match the latest based on my roll-up patch set
Merge pull request #161 from mattray/more-roles

Updated OpenStack role lists to match the latest