entitlement: fix regression in bundle timeline API

After the recent optimization iterations, the timeline
API was broken and didn't return blocking states for
non-entitlement services anymore.

This patch fixes it and optimizes the entitlement code a bit further
by limiting the amount of DAO calls in blocking states.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge remote-tracking branch 'origin/master' into junction-bug-fixes