Added support for merged file lists from both the task global options and task target options.
Added support for new file objects with 'pattern', 'watched','included' and 'served' attributes