Merge branch 'k.o/for-4.3-v1' into k.o/for-4.4
authorDoug Ledford <dledford@redhat.com>
Wed, 21 Oct 2015 20:40:21 +0000 (16:40 -0400)
committerDoug Ledford <dledford@redhat.com>
Wed, 21 Oct 2015 20:40:21 +0000 (16:40 -0400)
Pick up the late fixes from the 4.3 cycle so we have them in our
next branch.


Trivial merge