Merging IBM int. test and some code fix

Merged Bhushan Rade requested to merge ibm-int-test into master

IBM integration test and some code fix

Merge request reports