Refactor

  * De-duplicate scripts
  * Fix kernels to latest lts-xenial virt

Change-Id: I01280ad119146345eb02518ba80c2c6e8d37c40e
diff --git a/ubuntu-16.04/template.json b/ubuntu-16.04/template.json
index aa80d0a..564dd69 100644
--- a/ubuntu-16.04/template.json
+++ b/ubuntu-16.04/template.json
@@ -14,6 +14,7 @@
         "virtualbox-iso": {
           "scripts": [
             "scripts/base.sh",
+            "scripts/motd.sh",
             "scripts/salt.sh",
             "scripts/network.sh",
             "scripts/vagrant.sh",
@@ -26,6 +27,7 @@
         "vmware-iso": {
           "scripts": [
             "scripts/base.sh",
+            "scripts/motd.sh",
             "scripts/salt.sh",
             "scripts/vmware.sh",
             "scripts/security.sh",
@@ -36,6 +38,7 @@
         "qemu": {
           "scripts": [
             "scripts/base.sh",
+            "scripts/motd.sh",
             "scripts/salt.sh",
             "scripts/network.sh",
             "scripts/security.sh",
@@ -47,6 +50,7 @@
           "scripts": [
             "scripts/docker.sh",
             "scripts/base.sh",
+            "scripts/motd.sh",
             "scripts/salt.sh",
             "scripts/cleanup.sh"
           ]
@@ -54,6 +58,7 @@
         "digitalocean": {
           "scripts": [
             "scripts/base.sh",
+            "scripts/motd.sh",
             "scripts/salt.sh",
             "scripts/security.sh",
             "scripts/cleanup.sh"