Merge tag 'upstream/1.1.4'

.gitignore

.travis.yml

pom.xml

src/main/java/jnr/netdb/FileProtocolsDB.java

src/main/java/jnr/netdb/FileServicesDB.java

src/main/java/jnr/netdb/IANAProtocolsDB.java

src/main/java/jnr/netdb/IANAServicesDB.java

src/main/java/jnr/netdb/NativeProtocolsDB.java

src/main/java/jnr/netdb/NativeServicesDB.java

src/main/java/jnr/netdb/NetDBEntry.java

src/main/java/jnr/netdb/NetDBFilter.java

src/main/java/jnr/netdb/NetDBIterator.java

src/main/java/jnr/netdb/NetDBParser.java

src/main/java/jnr/netdb/Protocol.java

src/main/java/jnr/netdb/ProtocolsDB.java

src/main/java/jnr/netdb/Service.java

src/main/java/jnr/netdb/ServicesDB.java

src/main/java/jnr/netdb/StringUtil.java

src/test/java/jnr/netdb/FileProtocolDBTest.java

src/test/java/jnr/netdb/FileServicesDBTest.java