Reorder exits, remove test policies from nfilter-main, print chngp string.
Merge branch 'merge_modules' of github.com:webbhorn/linux-stable into merge_modules