CBLT-82:  further adapt rpm builds to build environment

Change-Id: I90b27e813a09ea574a1c501fa5f2d9bd73b1bf0e