more refactoring, doop now on HDP-2.1 rpms