CLOUDIFY-2517 - handling empty tenant id or null quota object, fixed typos