Fix DIB_HADOOP_VERSION checks of hadoop-cdh element

We shouldn't begin to build image if specified hadoop version
is not supported for CDH

Change-Id: I592aec1d3d539231db7b2ca421d58b01cd7101de
Merge "Fix DIB_HADOOP_VERSION checks of hadoop-cdh element"