[OS-BUILD PATCH 0/5] Forward port centos changes for early zstream release numbering