PersonAddress and Location should include additional custom fields

The current columns in OpenMRS are not sufficient for address scheme followed in some countries. Attached is the comparison and the mapping we tried for the required columns:

This becomes really difficult when a country have different addressing schemes for Rural and Urban areas. Can we please increase extra columns available in OpenMRS for address mappings.

Dev Notes

These columns will need to be added to both PersonAddress and Location