handle race condition on delete followed by get
Merge remote-tracking branch 'opennms/1.12'