Fix/2.2/build rpms