NMS-6935 wait for sub-processes to stop before returning from onStop
NMS-6935 make sure Xmlrpcd subprocesses have stopped before stopping

Merge remote-tracking branch 'origin/jira/NMS-6935' into rc/stable/1.14.0