Optional force manage

Rebase on upstream master.  This is largely just to get in the "don't deploy an empty resolv.conf" fix.

@kvs @baldowl for comment and review.