Revert "Revert "Revert "Revert "Properly implemented EntitlementContext producer.""""

This reverts commit 18e728b69ad299a6abb89a41c69a4016f5e0fe42.
Revert "Revert "Yet another fix for EntitlementContext producers...""

This reverts commit e097c21f539e3866b27872b003bab33d34be6cb8.
Trying to finally get EntitlementContext producers to work.

This reverts commit 18e728b69ad299a6abb89a41c69a4016f5e0fe42.
Revert "Revert "Yet another fix for EntitlementContext producers...""

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