Merge "Add the LOCAL_EMMA_COVERAGE_FILTER so emma reports make sense" into ub-mail-master