updated error handling strategy: if an error occurs (communication
between YQL and client) a retry is triggered later on
changes merged
Merge remote-tracking branch 'origin/master'