Merge master into 2.9#455

Merged

jujubot merged 15 commits intojuju:2.9from

SimonRichardson:2.9

Nov 3, 2020

Commits on Oct 23, 2020

Commits on Oct 27, 2020

Correctly handle the path if it's missing
SimonRichardson
committed

Commits on Oct 28, 2020

Handle strict mode with an empty entity
SimonRichardson
committed

Commits on Oct 29, 2020

Commits on Nov 2, 2020