Re-apply #815 - resolve SparkR implementation conflict#820

bzz wants to merge 2 commits intoapache:masterapache/zeppelin:masterfrom

bzz:re-apply-SparkR-implementation-conflict-815bzz/incubator-zeppelin:re-apply-SparkR-implementation-conflict-815Copy head branch name to clipboard