CA-137829 CA-137959 Revert fix to CA-108676 because of collateral damage
CA-137829 CA-137959 Revert fix to CA-108676 because of collateral damage

huizh/xenadmin,jijiang/xenadmin,MihaelaStoica/xenadmin,stephen-turner/xenadmin,xenserver/xenadmin,letsboogey/xenadmin,robhoes/xenadmin,jijiang/xenadmin,agimofcarmen/xenadmin,robhoes/xenadmin,kc284/xenadmin,ushamandya/xenadmin,cheng-z/xenadmin,geosharath/xenadmin,cheng-z/xenadmin,xenserver/xenadmin,stephen-turner/xenadmin,Frezzle/xenadmin,letsboogey/xenadmin,minli1/xenadmin,stephen-turner/xenadmin,jijiang/xenadmin,robhoes/xenadmin,qlw/xenadmin,minli1/xenadmin,kc284/xenadmin,stephen-turner/xenadmin,GaborApatiNagy/xenadmin,huizh/xenadmin,agimofcarmen/xenadmin,Frezzle/xenadmin,cheng-z/xenadmin,geosharath/xenadmin,qlw/xenadmin,agimofcarmen/xenadmin,GaborApatiNagy/xenadmin,qlw/xenadmin,letsboogey/xenadmin,letsboogey/xenadmin,cheng-z/xenadmin,GaborApatiNagy/xenadmin,huizh/xenadmin,agimofcarmen/xenadmin,minli1/xenadmin,cheng-z/xenadmin,minli1/xenadmin,cheng--zhang/xenadmin,kc284/xenadmin,kc284/xenadmin,MihaelaStoica/xenadmin,MihaelaStoica/xenadmin,cheng--zhang/xenadmin,geosharath/xenadmin,geosharath/xenadmin,MihaelaStoica/xenadmin,letsboogey/xenadmin,ushamandya/xenadmin,GaborApatiNagy/xenadmin,ushamandya/xenadmin,robhoes/xenadmin,minli1/xenadmin,cheng--zhang/xenadmin,cheng--zhang/xenadmin,robhoes/xenadmin,stephen-turner/xenadmin,jijiang/xenadmin,GaborApatiNagy/xenadmin,xenserver/xenadmin,cheng--zhang/xenadmin,minli1/xenadmin,agimofcarmen/xenadmin,cheng-z/xenadmin,huizh/xenadmin,kc284/xenadmin,Frezzle/xenadmin,jijiang/xenadmin,ushamandya/xenadmin,huizh/xenadmin,letsboogey/xenadmin,MihaelaStoica/xenadmin,huizh/xenadmin,GaborApatiNagy/xenadmin,Frezzle/xenadmin,qlw/xenadmin,MihaelaStoica/xenadmin,ushamandya/xenadmin,qlw/xenadmin,stephen-turner/xenadmin,Frezzle/xenadmin,geosharath/xenadmin,geosharath/xenadmin,ushamandya/xenadmin,Frezzle/xenadmin,cheng--zhang/xenadmin,jijiang/xenadmin,robhoes/xenadmin