fixed failing tests, added comments of failing BZs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/redhat/qe/katello/common/KatelloConstants.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/redhat/qe/katello/base/KatelloCliTestScript.java
Merge pull request #382 from hhovsepy/master

fixed failing tests, added comments of failing BZs