GCP-7473
Merge remote-tracking branch 'remotes/origin/master' into master_GCP-7512_dynamic_connection

Conflicts:
	src/main/java/org/generationcp/ibpworkbench/service/BreedingViewServiceImpl.java