Merge branch '2838_spaces_in_rpm' into 4.8.1-stable