Upgrade maestro module to support agent >= 2.1.0