Merge branch 'LPS-40398' of https://github.com/jonmak08/liferay-plugins into LPS-40398 & source formatter

Conflicts:
	portlets/notifications-portlet/docroot/notifications/view_entries.jsp