adding DAR-985 bug prevention test case
small javadoc description fix
small fixes
CR round 1 fixes
Merge pull request #103 from Wikia/DAR-985

Dar 985