Fix HiveConf serialization.

Conflicts:
	src/main/scala/shark/execution/serialization/XmlSerializer.scala