Merge pull request #542 from hhovsepy/sam-1.3

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

added more checks to recreate deleted org
Added new scenario for sam-upgrade
Merge pull request #544 from tkolhar/sam-1.3

Added new scenario for sam-upgrade
more scenarios
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3