Added map.jinja for oracle-java
Updated oracle-java.java6 to use map.jinja
Fixed path in readme
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fixed path in readme
  Updated oracle-java.java6 to use map.jinja
  Added map.jinja for oracle-java