Update notes for submitted changes

* Reformat the usage message
Update notes for submitted changes

* Refactor logic around selinux bug 1204824