Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Format correctly Build file with buildifier
  Consume events-broker from source
  Skip web sessions replay for persisted cache

Change-Id: I877012c7414b6a02435cc4b52f91465a5f8e754c