Branch b1_6

b=16190

revert attachment 17583 (kernel config file updates) since attachment 17582
has already been backed out due to incompatibility with OFED 1.3.1.