Changes to engine branch support rpm builds