Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	pom.xml
#	src/main/java/org/peergos/EmbeddedIpfs.java
#	src/main/java/org/peergos/HostBuilder.java
#	src/main/java/org/peergos/IpnsPublisher.java
#	src/main/java/org/peergos/RamAddressBook.java
#	src/main/java/org/peergos/blockstore/s3/S3Blockstore.java
#	src/main/java/org/peergos/net/APIHandler.java
#	src/main/java/org/peergos/protocol/dht/Kademlia.java
#	src/main/java/org/peergos/protocol/dht/KademliaProtocol.java
#	src/test/java/org/peergos/BitswapMirrorTest.java
#	src/test/java/org/peergos/BitswapTest.java
#	src/test/java/org/peergos/BootstrapTest.java
#	src/test/java/org/peergos/EmbeddedIpfsTest.java
#	src/test/java/org/peergos/FindPeerTest.java
#	src/test/java/org/peergos/FindProviderTest.java
#	src/test/java/org/peergos/HandlerTest.java
#	src/test/java/org/peergos/HttpProxyTest.java
#	src/test/java/org/peergos/IpnsTest.java
#	src/test/java/org/peergos/KademliaTest.java
#	src/test/java/org/peergos/KuboFindProviderTest.java
#	src/test/java/org/peergos/P2pHttpChatTest.java
#	src/test/java/org/peergos/P2pHttpTest.java
#	src/test/java/org/peergos/PingTest.java
#	src/test/java/org/peergos/ProvideTest.java
#	src/test/java/org/peergos/RelayTest.java