Fixed os detect for ondemand, added t2.* instances
Added support for old generation instances