Regarding the conflict, as per Jay S: "Just accept the non-HEAD segment."

[BZ 1113707] Allow sorting resourceName, scheduleName, timestamp and oobFactor on the server-side, rest on the client side only
(cherry picked from commit 3fa0ecba6a45986efbd1e63afff1f6ce54612763)

Conflicts:

	modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/report/measurement/MeasurementOOBDataSource.java