fixed tests.foreman.cli.test_subscription
rhel6/rhel7 tomcat restart
comments accounted for
Merge pull request #1165 from AdamSaleh/manifest-review

Manifest mock, and fixed tests.foreman.cli.test_subscription