[GIT PULL] audit fixes for 2.6.31