update es_mapping epa skin shift
Merge branch 'tao' into sprint10