Merge branch...

Merge branch '24-a-non-admin-user-must-not-be-able-to-change-a-service-order-service-state' into 'develop'

Resolve "A non-admin user must not be able to change a Service Order & Service state"

See merge request !16