Built-in roles for now until @geerlingguy merges PR
Added tomcat6 without automatic dependency fetching (until PR is fixed upstream by @geerlingguy)