Previously the beat setup tasks were tagged with 'setup' but the include
statements were not, so the tasks were always skipped when using '--tags
setup'. This change adds tags to the includes so that the tasks are executed
as expected
Change-Id: If16069cd273d84a22b229b8140e5a8d56eed86d1