TRUNK-4026: Locking OpenMRS API level not to show various content items
Merge pull request #1018 from rpuzdrowski/TRUNK-4026

TRUNK-4026: Locking OpenMRS API level not to show various content items
Allow implementations to control whether drug orders require formulation TRUNK-4440

Follow up to address review comments  - TRUNK-4440
Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name

Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name

Cleaned up javadocs, code in Order, DrugOrder classes and corrected typo in test data file name
Upgraded jackson api version to 1.9.13 - TRUNK-3978
Merge remote-tracking branch 'upstream/master' into TRUNK-4446