Patch Set 1: Looks good to me, but someone else must approve

I can both use mvn headless and pde headless/ui using this configuration. This is something we should strive for in this case due to the mixed parties.