Upgraded Dockerfils and scripts to HDP 2.1