Csd branch 0.9 merge

@markhamstra - initial merge of 0.9 spark for review.