Merge branch...

Merge branch '8-a-service-order-with-1-order-items-is-not-handling-the-supporting-services-well' into 'develop'

Resolve "A Service Order with >1 order items is not handling the supporting services well"

See merge request !14