MIFOSX-1288,MIFOSX-1280,build#699 testcase fixes
Merge pull request #927 from lingalamadhukar/MIFOSX-1267

MIFOSX-1288,MIFOSX-1280,build#699 testcase fixes