fixing some possible places where state can be set as empty
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata