Merge branches 'cocoa-configure-event-rel', 'catalyst-web-rel' and 'pvweb-add-filebrowser-cache-option-rel' into release

Change-Id: I3ce26eaa5cf8b7ce4da5a92f13527f60228b6a03