Cherry pick from sergey's branch: use new error parameterization also for border track error estimation for track merging
Cherry pick from sergey's branch: use new error parameterization also for border track error estimation for track merging

ALICEHLT/AliRoot,coppedis/AliRoot,coppedis/AliRoot,alisw/AliRoot,miranov25/AliRoot,miranov25/AliRoot,ALICEHLT/AliRoot,ALICEHLT/AliRoot,miranov25/AliRoot,sebaleh/AliRoot,shahor02/AliRoot,miranov25/AliRoot,sebaleh/AliRoot,alisw/AliRoot,coppedis/AliRoot,sebaleh/AliRoot,alisw/AliRoot,coppedis/AliRoot,sebaleh/AliRoot,coppedis/AliRoot,sebaleh/AliRoot,ALICEHLT/AliRoot,sebaleh/AliRoot,shahor02/AliRoot,coppedis/AliRoot,shahor02/AliRoot,alisw/AliRoot,alisw/AliRoot,shahor02/AliRoot,ALICEHLT/AliRoot,alisw/AliRoot,coppedis/AliRoot,coppedis/AliRoot,shahor02/AliRoot,miranov25/AliRoot,shahor02/AliRoot,ALICEHLT/AliRoot,sebaleh/AliRoot,alisw/AliRoot,alisw/AliRoot,miranov25/AliRoot,miranov25/AliRoot,miranov25/AliRoot,shahor02/AliRoot,ALICEHLT/AliRoot