various katello deploy fixes for recent changes