Revert "Revert "Properly implemented EntitlementContext producer.""

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