Merge changes I58d43128,Ie34c958f
Kenny Root authored
* changes:
  Remove HAVE_SELINUX guards, part 2
  Remove HAVE_SELINUX guard
2e0d1af7