Fix optional deps being pulled into addon deployments
Merge branch '2.0' of github.com:forge/core into 2.0