#1392 Support for joining table more than once using alias and filter in add_component
S3ContingencyTable: Get custom layer labels from report options.
Merge branch 'master' of https://github.com/liezl200/eden