Add more environment state handling

This is require for the cases when CF tries to bind a service which is not deployed yet.

Change-Id: I43d05a450e0d7cee8d2faae502a3292e9398cd19