Changes for zabbix upgrade and HDP repo URL changes

Issues #186 and #189