Merge "Add usage of 2018.8.0 dbs roles"