Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/xlcloud-ci
Properly implemented EntitlementContext producer.
Revert "Properly implemented EntitlementContext producer."

This reverts commit 0d2ce07d8ea2bc80efb2bd7614e2c0036c02f566.
Merge branch 'master' of gitorious.ow2.org:~xlcloud-continuous-integration/xlcloud/xlcloud-ci