lint fixes
Merge branch 'saltcallreturn' into develop