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