886718 - allow better translation of one string

Original string has different translation depending on object_type.
I created several new strings with hardcoded object_type and
only left as variable in string "label".

This is quite ugly code, but I prefer it over ugly sentence as suggested
in:
https://bugzilla.redhat.com/show_bug.cgi?id=886718#c7
(even if it is grammatical correct).
comp resources - fixed system tests
912698 - ak subscribe:  take the number of sockets in pool into account

When a pool has two sockets and my machine 3, 2 pools should be consumed.
Merge pull request #1633 from iNecas/912698

912698 - ak subscribe:  take the number of sockets in pool into account
Fixed typo in activation_key comment
Merge pull request #1642 from daviddavis/akt

Fixed typo in comment in activation_key comment
Merge pull request #1594 from xsuchy/pull-req-bz886718

886718 - allow better translation of one string
Fixing fencing issues in headpin

Fixes #1639
Merge pull request #1645 from daviddavis/ff

Fixing headpin fencing issues
Merge pull request #1640 from tstrachota/comp_res_fix

comp resources - fixed system tests
updating .travis.yml to pull correct katello config and adding headpin
to tests