RF-13634: consolidate deployment classes