Merge "Bug 664 Update security.xml in web bundle"