merge of 'Added some Hadoop configurations (aka shims) not in the Big Data plugin ...'