Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: ReplicationIT: speedup drain replication queue tests ReplicationIT: Remove unused variables in tests Reformat with GJF Option to drain the event queue before shutdown Change-Id: I02a30f057aba348f2977c12b669c17a560d710b1