Fix merge.
Fix merge.
Modify Faucet to support Spark parallel processing.