TRUNK-4133 - Changes based on review comments.
Add annotations for junit tests.
Some extra documentation.
Remove unnecessary executeDataset calls in OrderServiceTest
Make concept for discontinuation a normal concept, not a numeric
Additional assert statements