PUB-1016: Fix merge conflicts for Deep Learning Feature Extractor.

Conflicts:
	src/main/java/hex/deeplearning/DeepLearningModel.java