Change scala-common-enrich to pass network_userid

* Change unit test in scala-hadoop-enrich to send
  networkUserId in on the Thrift Object

Conflicts:
	3-enrich/scala-hadoop-enrich/src/test/scala/com.snowplowanalytics.snowplow.enrich.hadoop/good/LzoThriftTest.scala