BS 140903 fix authentication timeout
BS 140903 fix authentication timeout
Merge remote-tracking branch 'mooc/bs135'
[04092014] - Thien commit mornigh 04/09 for tester