Fold marketplace package into addon repository + align on 5.7-SNAPSHOT