ColumNameCache concurrency fix

NH-3420  bug fix
Formatting
Merge remote-tracking branch 'origin/3.1.0GA_column-cache-concurency-fix'