[SPARK-5979][SPARK-6032] Smaller safer --packages fix#4802

brkyvz wants to merge 2 commits intoapache:masterapache/spark:masterfrom

brkyvz:simple-streaming-fixbrkyvz/spark:simple-streaming-fixCopy head branch name to clipboard