Merge remote-tracking branch 'origin/v2-alpha' into gh-2580-dynamic-s…

…chema-removal

# Conflicts:
#	store-implementation/federated-store/src/main/java/uk/gov/gchq/gaffer/federatedstore/operation/FederatedOperationChainValidator.java