Use custom tag for container DOM element

d.o issue: https://www.drupal.org/node/2307553