Merge pull request #541 from tkolhar/sam-1.3

Added new scenario for sam-upgrade,added few new checks to existing ones
added new parameter to keep server after upgrade and store client/server
hostname in properties file for trigger run of other jobs
Merge pull request #542 from hhovsepy/sam-1.3

added new parameter to keep server after upgrade and store client/server
added more checks to recreate deleted org
Merge pull request #543 from hhovsepy/sam-1.3

added more checks to recreate deleted org
Added new scenario for sam-upgrade