Update diskimage-builder element for tomcat

Updated tomcat to tomcat7 since apt-get does not recognize
tomcat for install.

Change-Id: Iea7c4648408e7fdab585e1d981781d8a5574befb
Closes-Bug: #1263632