Fixed check for iSeries;
Merge master into ibm_db2