Merge branch 'stable-3.6' into master

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

Change-Id: I710be1c22628d9b0edbb75068bc3f5dbe91f0fab