Merge pull request #414 from hhovsepy/sat-6.0

fixed failing tests
First version is ready to be tested on jenkins
Merge pull request #415 from hhovsepy/sat-6.0

integrated SAM with LDAP
Merge pull request #417 from hhovsepy/sat-6.0

integrate username/password passing to LDAP configuration
Merge pull request #420 from hhovsepy/sat-6.0

Bug 896074 still exists
Merge pull request #426 from hhovsepy/sat-6.0

2 bugs were fixed
Merge branch 'sat-6.0' of https://github.com/gkhachik/katello-api into sat-6.0
test commit to run on jenkins