TRUNK-4156 - revised

Please ignore my previous pull request https://github.com/openmrs/openmrs-core/pull/480 and use this instead. 

Changes from previous pull request
-----------------------------------------------------

- Removed unintended changes in liquibase-schema-only.xml
-  Removed defaulting of care setting to OUTPATIENT.