Make a distinction in between overriden and converged, closes #1631
Deprecate :umbrella path opt in favor of :in_umbrella

The previous :umbrella option was ambiguous, as it was not clear
if it was a dependency inside an umbrella or an umbrella dependency.
Update CHANGELOG