Lower vbox memory and fix etcd name
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 branch 'master' of github.com:INAETICS/node-provisioning-service
Merge pull request #2 from INAETICS/remove-imagebuildermacros

Remove imagebuildermacros
Added to default-resources Celix bundles
Added to default-resources Celix bundles
Merge branch 'nps_celix_bundles' of https://github.com/INAETICS/node-provisioning-service into nps_celix_bundles