Merge roles from OpenDeployment repo

Change-Id: I072f946924e74fc92f98c98b344263f3873930ba