Merge changes I58d43128,Ie34c958f

* changes:
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard