Merge "Added distsuffix option to buildrpm.sh"