Merge branch 'trusty'

Conflicts:

Build arch was fixed in master to any (i386 in trusty)
	packages/default/dymo-cups-drivers/debian/control

Just the JDK -> JRE switch:
	packages/default/oracle-java-jdk/debian/changelog
	packages/default/oracle-java-jdk/debian/patches/00_setup_makefile
	packages/default/oracle-java-jdk/debian/postinst
	packages/default/oracle-java-jdk/debian/prerm