o Add $waitforit flag to killbypid() and use it to simplify code.

o When requesting a configure via id, do not exclude the service
  because it is disabled.  The pidfile needs to be killed still.

o Unwind the convoluted code paths in the VPN plugin during early
  configure: kill service, probe for active, then do work.

(cherry picked from commit 2ddb95f7)