fixed merge conflicts
merged conflicts again
kerberos apache module