CFY-1533 merged RUN commands in docker file to optimize commit number