Fix CI build failure on branch-0.7
### What is this PR for?
CI build is failing on `branch-0.7`. This PR cherry-pick some necessary commits
from
https://github.com/apache/zeppelin/pull/2003
https://github.com/apache/zeppelin/pull/2081
and a commit (3ae8760) fixes changes made by
https://github
Repository: zeppelin
Updated Branches:
refs/heads/branch-0.7 730784bab -> bfa812a9d
Fix CI build failure on branch-0.7
### What is this PR for?
CI build is failing on `branch-0.7`. This PR cherry-pick some necessary commits
from
https://github.com/apache/zeppelin/pull/2003
https://github.com