Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix synopsis in replication start cmd documentation Don't wait for pending events to process on startup Change-Id: If4bc69761a19a0137301535759dc8a317ea04186