Merge branch 'Confluex-MULE-7821-from-3.x' into mule-3.x

(cherry picked from commit 17070e5524d25672dfeafcd83db6277572c3eefc)