Bhrathi,d3| Fixing build after MRS update
Rohan | Changed the duration to be of integer type

Conflicts:
	bahmnicore-omod/src/test/java/org/openmrs/module/bahmnicore/web/v1_0/mapper/DrugOrderMapperTest.java
Merge branch 'release-5.0'