HH-37025 fixes for debian packaging