(cherry picked from commit 6c3274bb)
Conflicts: provider/secret-aws/pom.xml provider/secret-gc/pom.xml