Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Fix NPE in PushResultProcessing Fix start --wait to track in-flight collisions and to not fail Improve URLmatching to match real Urls Convert PushResultProcessing to an interface Change-Id: I35f258fd3200054d2c114fea4ddea79fcbc9ddd4