Fixed some line endings.
Merge branch '1.9.x_dev' of github.com:OpenHMIS/openmrs-core into 1.9.x_dev