sonar 3.7.2

Closes #23341.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
grails 2.3.1

Closes #23344.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
serf: fix universal build

Fixes #23342.
Add OS.mac? and OS.linux?
Rename MacOS to OS::Mac
Move MacOS modules under OS::Mac namespace

Closes #23138.
Merge XQuartz and X11 modules
Make condition clearer using names
Extract repeated conditional to a method