Merge pull request #546 from hhovsepy/sam-1.3

added more checks for upgrade scenarios
fixed more failing tests
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3