Adding exception handling component to integrate with jersy exception mapper
fixing merge conflicts