[#TRUNK-4111] Exclude longitude, latitude, start date and end date fields from address template

https://issues.openmrs.org/browse/TRUNK-4111 | 
Closed pull/1023 as a result of incosistentcommits while resolving conflict