Added fixes for Coverity issues 1148456, 1148455, 1147707, 1147706,
1147697, 1147696 and 1147699.  TRQ-2424