Fixes for JIRAs CIDEVMI-1575, CISWMI-287 and CISWMI-282. Updated unit tests.
Code cleanup.
Merge pull request #342 from tapanagupta/acdp_mip4

Fixes for JIRAs CIDEVMI-1575, CISWMI-287 and CISWMI-282. Updated unit te...