This synchronises sos in master to the current upstream sos-2.2 branch and includes all patches from RHEL6 not already present.