CLOUDIFY-1432 avoid ArrayIndexOutOfBoundsException that can happen if there are naked cloud services running
Merge branch 'master' of https://github.com/CloudifySource/cloudify