Merge proposals dependent on lp://staging/~clint-fewbar/pyjuju/add-policy-no-hardcoded-tools

1. add-policy-no-hardcoded-tools
2. Dependent merge proposals