Updated due to a merge issue.

Comments now clearly state, I borrowed and adapted code and ideas from
a core autopkg processor.