fix for potential race condition in the handling of snapshotted pending requisitions
fix formatting
fix for potential race condition in the handling of snapshotted pending requisitions

Conflicts:
	opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/FasterFilesystemForeignSourceRepository.java
	opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/FusedForeignSourceRepository.java
	opennms-provision/opennms-provision-persistence/src/test/java/org/opennms/netmgt/provision/persist/MockForeignSourceRepository.java
java7 fix
Merge branch '1.12'

Conflicts:
	opennms-provision/opennms-provision-persistence/src/main/java/org/opennms/netmgt/provision/persist/FilesystemForeignSourceRepository.java
fix for OOM when eventd queue length is enabled

PendingPollEvents could stick around forever waiting for an event
if outage-related events got dropped.
Merge branch '1.12'

Conflicts:
	opennms-services/src/main/java/org/opennms/netmgt/poller/DefaultPollContext.java
Merge branch 'master' of git://github.com/OpenNMS/opennms