buildenv/1.3.x/centos-ermine: merge 1.2.x centos-ermine back into the 1.3.x variant.
buildenv/1.3.x/osx: migrate 1.2.x/osx build env's ZeroC Ice build fix into 1.3.x.