Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Only fire the specified pending event URI

Adapt to the new refactored code of the config
and destinations in stable-3.1 and remove unused
methods coming from the merge with stable-3.0.

Change-Id: Ica9da7c735bbd965bc6704dec35419dba126ab66