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
Merge pull request #545 from tkolhar/sam-1.3

Added new scenario for sam-upgrade - check Default Custom Info at Org level
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
RHSM register changed output:
added: deltacloud.description allowing to see which job/build prepared the machine
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into sam-1.3
aded more checks, fixed failing tests
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
Merge pull request #547 from hhovsepy/sam-1.3

fixed more failing tests