style cleanups, fix for xenial zmq rename

Dockerfile

@@ -10,14 +10,30 @@ RUN sed -i \
         /etc/apt/sources.list ; \
         cat /etc/apt/sources.list
 
-RUN apt-get update && \
+RUN \
+    apt-get update && \
     apt-get install -y \
-    build-essential libtool autotools-dev automake pkg-config libssl-dev \
+        automake \
-    libevent-dev bsdmainutils libzmq3 libzmq3-dev \
+        autotools-dev \
-    libboost-system-dev libboost-filesystem-dev libboost-chrono-dev \
+        bsdmainutils \
-    libboost-program-options-dev libboost-test-dev libboost-thread-dev \
+        build-essential \
-    libminiupnpc-dev git && \
+        git \
-    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+        libboost-chrono-dev \
+        libboost-filesystem-dev \
+        libboost-program-options-dev \
+        libboost-system-dev \
+        libboost-test-dev \
+        libboost-thread-dev \
+        libevent-dev \
+        libminiupnpc-dev \
+        libssl-dev \
+        libtool \
+        libzmq3-dev \
+        libzmq5 \
+        pkg-config \
+    && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN git clone https://github.com/bitcoin/bitcoin.git /usr/local/src/bitcoin
 
@@ -30,10 +46,18 @@ RUN cd /usr/local/src/bitcoin && \
     cd / && \
     rm -rf /usr/local/src/bitcoin
 
-RUN apt-get remove -y \
+RUN \
-    build-essential libtool autotools-dev automake \
+    apt-get remove -y \
-    pkg-config bsdmainutils git && \
+        automake \
-    apt-get autoremove -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+        autotools-dev \
+        bsdmainutils \
+        build-essential \
+        git \
+        libtool \
+        pkg-config \
+    && \
+    apt-get autoremove -y && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ENV HOME /var/lib/bitcoin
 RUN useradd -s /bin/bash -m -d /var/lib/bitcoin bitcoin