Import CM additions/fixes in Makefiles and releasetools