Merging some changes in org.parallelj.code.validation plugin and the
feature file.