1.25.2 merged changes from collab branch

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/oligoClasses@86229 bc3139a8-67e5-0310-9ffc-ced21a209358