fixed JUnit test errors on GCP-7878, GCP-7879, GCP-7880, GCP-7881
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware