Merge "Bug 5452 - stable / beryllium - Adding comments that details the xml configuration proactive mode setting."