TRUNK-3658: FormService.saveFormResouce doesn't effectively replace existing resources

https://tickets.openmrs.org/browse/TRUNK-3658