implemented GCP-7877, GCP-7878, GCP-7879, GCP-7880
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

Conflicts:
	src/test/java/org/generationcp/middleware/manager/test/TestGenotypicDataManagerImpl.java