GCP-5698
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware

# By Crisjaira Villarino (1) and Darla Grace Ani (1)
# Via Darla Grace Ani (2) and Crisjaira Villarino (1)
* 'master' of https://github.com/digitalabs/IBPMiddleware:
  GCP-5696
  added PLOT_NO and ENTRY_NO in label list as they're found in exported Fieldbook trials

Conflicts:
	src/main/java/org/generationcp/middleware/domain/dms/PhenotypicType.java