merge:from apache-master(for zeppelin 0.5.6)#893

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

hj5:masterhj5/incubator-zeppelin:masterCopy head branch name to clipboard