Fixed: Spark fails with HDFS Protobuf version conflict
Merge remote-tracking branch 'origin/release/version-0.5'