include patch3 from upstream to pass tests on el6