fixed failing tests
Merge pull request #549 from hhovsepy/sam-1.3

fixed failing tests
Merge pull request #548 from tkolhar/sam-1.3

Added the remaining few scenarios for sam-upgrade
sorting issue of TestNG - seems fixed now. Manifest refresh tests in proper try-finally blocks.
minor fix due to rebase
refactoring the gradle file too
Fixed failing system tests in sam-cli