RA-74 Added skipping disabled fields
Merge branch 'master' of https://github.com/openmrs/openmrs-module-uicommons