Update the rules file
Merge branch 'upstream/jruby1.7' into jruby1.7
Update to 1.7.4