Merge branch 'master', remote branch 'origin/master'
Updated pi smoke test to HDP 2 jars