Merge "Adding missing rpm packages" into frankfurt