Merged FUNCTOR-24 with SVN trunk
Fix checkstyle errors