Fix role:commons duplicate definition

Regression introduced by I45def381a30c5c0719ab38ca627c7c91df91c5e3.

Change-Id: I4d6f9704ce0e931f5c9afe576a77a1e863e3762a