Fixed incorrectt PID matching for neutron-*-agents

Change-Id: I15ea6cce54135f9d91080c736ba496c3002aa182
Closes-bug: #1269334
Merge "Fixed incorrectt PID matching for neutron-*-agents" into stable/4.0