Merge "Removing log4j from policy/parent"