Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
moved properties creation to SetupServers
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
added more checks with org deletion
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
Merge pull request #606 from hhovsepy/sam-1.3

added more checks for upgrade scenarios