Fix RHEL >= 7 & add re-export to make changes in /etc/export effective