fix ci.jruby.org since some dependency was missing [skip ci]
Merge branch 'jruby-1_7' of jruby.org:jruby into jruby-1_7
maybe this time the change really goes online to fix the IT with tomcat [skip ci]
[Issue-1556] - Dir.home should first try to return the path defined in HOME

Dir.home should point to the path defined in HOME and if it's nil then
it should point to path defined user.home and if both are nil then
should point to the path defined in LOGDIR.
String#{to_r,to_c} should not use backref when calling gsub internally
Merge pull request #1564 from jruby/dont_use_backref_for_string_to_r_and_to_c

String#{to_r,to_c} should not use backref when calling gsub internally
Merge with jruby-1_7