HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include aspect files. Contributed by Konstantin Boudnik.