Remove unnecessary Composition in WorkPackageModel

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Remove unnecessary Composition in QueryModel

Signed-off-by: Alex Coles <alex@alexbcoles.com>
Merge pull request #1646 from opf/fix/remove-work-package-model-composition

Remove work package model composition