Merge branch 'stable-2.10' into stable-2.11 * stable-2.10: Fix replication_log with external log4j.configuration Change-Id: I894ad73610106fe6e2b4d56d6b1749546e14c3b8