Merge "Apex: add back legacy support for danube rpm"