Special bit permissions: take two ; restore BSD conditional fix

Two separate commits, so that should permissions work be reverted, the other fix for conditionals will not be lost again.

See https://github.com/cfengine/core/pull/1593 for background.