Fix DatePicker Glyphs for left and right icons
GCP-5970 Added correct calculation logic of Sheets last row number to PoiUtil with accompanying unit tests
GCP-5970 - Fixed Paging Info to return correct page count info
GCP-5892 Apply validation of valid values for the LABEL column(last column in fb format) for phenotypicTypes except for Constants and Variates
GCP-5773
bug fixes
GCP-5771
GCP-5773 bug fix
GCP-5773 fix error with message params
rephrase error message
bug fix
GCP-5929
Fix to OpenSheetControllerTest
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/i18n/Messages.properties
	src/main/webapp/WEB-INF/pages/defineVariableImport.html
GCP-5936 As a user, I should be able to view a Success Step 7 for the DataImport Wizard tool
Temporary disable of GCP-5929
Continuing implementation for step 6
Partial merge from master
Partial merge from master
Merge remote-tracking branch 'origin/master' into angular

Conflicts:
	src/main/java/com/efficio/etl/service/impl/ETLServiceImpl.java
	src/main/java/com/efficio/etl/web/AbstractBaseETLController.java
	src/main/java/com/efficio/etl/web/CategorizeHeadersController.java
	src/main/java/com/efficio/etl/web/DefineVariableController.java
	src/main/java/com/efficio/etl/web/bean/UserSelection.java
	src/main/java/com/efficio/etl/web/bean/VariableDTO.java
	src/main/webapp/WEB-INF/pages/defineVariable.html