Combined multiple merge commits(3,4,5 & 6) into one.
Please forgive me again.

Signed-off-by: Dinesh Shetye <dinesh.shetye@lexisnexis.com>
Adding new fix.

Signed-off-by: Dinesh Shetye <dinesh.shetye@lexisnexis.com>
Bug fix EPE-3452

Signed-off-by: Dinesh Shetye <dinesh.shetye@lexisnexis.com>
Bug fix EPE-3452: TestCase failed

Signed-off-by: Dinesh Shetye <dinesh.shetye@lexisnexis.com>
Merge pull request #12 from dineshshetye/b2

Merging commits.