Merge:  MULE-7417: Log4j config watch dog thread is not being stopped when undeploying applications
(cherry picked from commit 6b9b03e6f167f2dfc15cfa0f7ac071327673f53e)
Merge:  MULE-7419: Addapted config file to 3.2.
(cherry picked from commit 6b9b03e6f167f2dfc15cfa0f7ac071327673f53e)