Changes to UnionRDD and EmptyRDD
Work around for SI-8479
Style fix