CLOUDIFY-2022 fix empty env case + test