further changes according to comments in the previous pull request TRUNK-4314
Merge pull request #924 from harsha89/TRUNK-4314-additional

further changes according to comments in the previous pull request TRUNK--4314
Doing some file formatting
TRUNK-4378 Modules using conditional loading should not fail on older versions
TRUNK-4212: SchedulerServiceTest.shouldSaveLastExecutionTime failing occasionally
Merge pull request #929 from anotherdave/TRUNK-4212-2

TRUNK-4212: SchedulerServiceTest.shouldSaveLastExecutionTime failing
Merge pull request #927 from felipeq/TRUNK-3967

TRUNK-3967: Added option to unvoid Person on UI
issue cannot enroll patient in a program more than once TRUNK-3483 and 4322 solution
TRUNK-4032: locking mechanism for person_attribute_type
Merge pull request #933 from rpuzdrowski/TRUNK-4032

TRUNK-4032: locking mechanism for person_attribute_type
TRUNK-4032:locking mechanism for person_attribute_type
Merge pull request #934 from rpuzdrowski/TRUNK-4032

TRUNK-4032:locking mechanism for person_attribute_type
Revert "[TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts."

This reverts commit 117eaed29198ccca156bda508022acf3f69b9e78.
changes done as per comment made in the pull request
added empty option to the selection list
TRUNK-4031: locking mechanism for patient_identifier_type
Merge pull request #935 from harsha89/TRUNK-4314-add

added empty option to the selection list TRUNK-4314
Merge pull request #937 from rpuzdrowski/TRUNK-4031

TRUNK-4031: locking mechanism for patient_identifier_type
Merge pull request #930 from harsha89/TRUNK-3483_4322

issue cannot enroll patient in a program more than once TRUNK-3483 and 4322 solution
wip