Redmine#5342: more package bundle fixes