Feature parsing should throw a bad request
Fixing unit test
Merge pull request #87 from yurigorokhov/pull_MT-13367_2.5

Pull mt 13367 2.5