Expand regex matching to support new network ids

The logging format changed from 'Service 0' to 'Service ethernet_0'.
This changes the regex matching to support that.

Note: Some logs eliminate the 'Service' entirely, but the ones parsed
here preserve the 'Service' to make the parsing code more clear.
Comments were added to those logs in the Shill code.

This also fixes a bug in the regex for service_state which was ignoring
non failure updates.

Bug: 967800
Change-Id: I8c335b4a49b7b264510778cb215aa2882670ecc6
2 files changed