add trusty-oraclejdk7, fix trusty-base