Bug 416927: Enhance director mojo for supporting additional Install Units

Here is a branch containing the original patch.