Fixed failing system tests in sam-cli
Merge pull request #554 from tkolhar/sam-1.3

Fixed failing system tests in sam-cli