CDB-1993 log not defined in testing env
Merge branch 'CDB-1993' into hotfix-20140312