A number of updates and extensions, most having to do with new
:- import p/3 from usermod(file). form.
Authored by: dwarren 2017-10-10
Parent: [r9097]
Child: [r9099]
