Merge pull request getporter#2145 from carolynvs/fix-permission-reset

Storage fix-permissions should handle missing config

Merge pull request getporter#2144 from carolynvs/fix-build-m1

Fix build target on an arm dev machine

Merge pull request getporter#2068 from carolynvs/fix-context-hierarch…

…y-during-load

Fix context passed when resolving secrets in config file