Merge pull request #16 from npeltier/SLING-8781

SLING-8781 use model's bundle context