LPS-32698 Autogenerated
LPS-32698 Javadocs
Revert "LPS-32698 Javadocs"

This reverts commit 91bf8eb406a90a0d2974d63cf129e137207f1b74.
LPS-32698 Rename all webDavRequest to webDAVRequest
LPS-31740 Added UI to view merge-fail-count for page / site templates with possibility to reset it
LPS-31740 Source formatting

1) Basic source formatting
2) Rename and refactor merge alert pages
3) Remove from Constants those which are not global across portal
LPS-31740 Permissions for reset and merge actions

Permissions for reset and merge prototype actions are checked in SitesUtil (directly or through the use of the non-local service) instead of in the action class.
LPS-31740 Display merge fail alert in template lists
LPS-31740 SF
LPS-32698 Is this really needed? If so, please readd back, looks like accidental code to me that was not removed after refactoring.
LPS-31740 Lang keys
LPS-31740 Fix duplicate id

The aui:input checkbox for "Automatically apply changes done to the page template" has the same name (and thus by default the same id) in the page details view and in the add page dialog. Since the latest is included (though hidden) in the html of the first, in order to prevent JS errors in actions on this checkbox, we have to explicitly assign it a different id in the add_layout.jsp, as done in other inputs of this view.
LPS-33381 Fix refererPlid override after page delete
LPS-33381 Source formatting
LPS-33381 make logic consistent with SitesUtil - deleteLayout
LPS-32143 Fix non compatible SQL query

All the fields named in the select list must be named in the group by clause. For fields which may have multiple values in the same group, a single value criteria must be forced. Thus for userId and userName  (which may have multiple values for the same resourcePrimKey, groupId, companyId, nodeId group) the MIN function is used to select a single value.
LPS-33083 Typo in the update SQL query will cause bad queries since the final table will not exist
LPS-32110 Fix benchmark test, friendlyURL should not contain space.
LPS-32110 Make it more obvious
LPS-32110 Consolidate