Port fixes for STRATOS-643 and STRATOS-646 to release branch

[Jeffrey Nguyen (jeffrngu)]

Hi Lakmal,

Prior to release of Stratos 4.0.0, you mentioned I should wait until 4.0.0 went 
out then double commit the fixes for STRATOS-643 and STRATOS-646 into release 
branch for 4.0.1.   Is now the right time do this?

Thanks,
-Jeffrey