Merge in changes from djs55/xen-api-rpm-buildroot:make-srpms branch