CFY-888 removed redundant check on openstack, fixed small bug