fixed possible NPE
removed unnecessary calls
keep rhsm upgrade
Merge branch 'sam-1.3' of https://github.com/gkhachik/katello-api into
sam-1.3

Conflicts:
	src/com/redhat/qe/katello/base/KatelloCliDataProvider.java
Merge pull request #489 from hhovsepy/sam-1.3

fixed failing tests, removed unnecessary code