Added openjdk to Dockerfile
Removed image builder macros and small cleanup

The ## macros would trigger image builder logic that is no longer
needed as openjdk and etcctl are now installed directly.

Also removed unused packages from the apt-get install list.
Merge pull request #2 from INAETICS/remove-imagebuildermacros

Remove imagebuildermacros