Also fixes a bug in which tags specified on top-level roles were not being passed down to dependent roles. Fixes #4656