Merge pull request #11469 from makinacorpus/cloud

states.cloud: handle better the error outputs
salt.state: fix an edge case of inclusion for error reporting
salt.state: fix an edge case of inclusion for error reporting
Merge branch 'hf1' into develop