Get manifest_gen.sh working for a few edge cases previously not considered.
Moar edge cases in manifest_gen.sh.

I screwed up the recursion on the last push too. Test test test.
Merge branch 'master' into selinux