Merge branch 'master' into rdap

Conflicts:
	whois-api/pom.xml
	whois-api/src/main/java/net/ripe/db/whois/api/freetext/FreeTextIndex.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/AbuseContactService.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/InternalUpdatePerformer.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/RestServiceHelper.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/StreamingException.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/StreamingMarshal.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/StreamingMarshalJson.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/StreamingMarshalXml.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/SyncUpdatesService.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/WhoisMetadata.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/WhoisRestService.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/mapper/AbuseContactMapper.java
	whois-api/src/main/java/net/ripe/db/whois/api/rest/mapper/WhoisObjectServerMapper.java
	whois-api/src/main/java/net/ripe/db/whois/api/whois/StreamingException.java
	whois-api/src/main/resources/applicationContext-api.xml
	whois-api/src/test/java/net/ripe/db/whois/api/ParagraphParserTest.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/AbuseContactTestIntegration.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/SyncUpdatesServiceTest.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/SyncUpdatesServiceTestIntegration.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/WhoisMetadataTestIntegration.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/WhoisRestServiceTestIntegration.java
	whois-api/src/test/java/net/ripe/db/whois/api/rest/mapper/WhoisObjectServerMapperTest.java
	whois-client/pom.xml
	whois-client/src/main/java/net/ripe/db/whois/api/rest/RestClient.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/StreamingException.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Attribute.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Attributes.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Flag.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/GeolocationAttributes.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/GrsMirror.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/GrsSource.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/GrsSources.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/InverseAttribute.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Parameters.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/PrimaryKey.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/QueryString.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Source.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/TemplateAttributes.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/Templates.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/TypeFilter.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/WhoisObjects.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/WhoisTags.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/domain/WhoisVersions.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/mapper/AbstractWhoisObjectMapper.java
	whois-client/src/main/java/net/ripe/db/whois/api/rest/mapper/WhoisObjectClientMapper.java
	whois-client/src/main/java/net/ripe/db/whois/api/syncupdate/SyncUpdateBuilder.java
	whois-client/src/main/java/net/ripe/db/whois/common/rpsl/AttributeSyntax.java
	whois-client/src/main/java/net/ripe/db/whois/common/rpsl/ObjectTemplate.java
	whois-client/src/main/java/net/ripe/db/whois/common/rpsl/RpslAttribute.java
	whois-client/src/main/java/net/ripe/db/whois/common/rpsl/RpslObjectBuilder.java
	whois-client/src/main/java/net/ripe/db/whois/common/rpsl/RpslObjectFilter.java
	whois-client/src/main/java/net/ripe/db/whois/query/QueryMessages.java
	whois-client/src/main/parser/bin/yacc.linux
	whois-client/src/main/parser/bin/yacc.macosx
	whois-client/src/main/parser/byacc/README
	whois-client/src/main/parser/byacc/aggr_bndry.y
	whois-client/src/main/parser/byacc/aggr_mtd.y
	whois-client/src/main/parser/byacc/components.y
	whois-client/src/main/parser/byacc/components_r6.y
	whois-client/src/main/parser/byacc/default.y
	whois-client/src/main/parser/byacc/export.y
	whois-client/src/main/parser/byacc/filter.y
	whois-client/src/main/parser/byacc/ifaddr.y
	whois-client/src/main/parser/byacc/import.y
	whois-client/src/main/parser/byacc/inject.y
	whois-client/src/main/parser/byacc/inject_r6.y
	whois-client/src/main/parser/byacc/interface.y
	whois-client/src/main/parser/byacc/mp_default.y
	whois-client/src/main/parser/byacc/mp_export.y
	whois-client/src/main/parser/byacc/mp_filter.y
	whois-client/src/main/parser/byacc/mp_import.y
	whois-client/src/main/parser/byacc/mp_peer.y
	whois-client/src/main/parser/byacc/mp_peering.y
	whois-client/src/main/parser/byacc/name.y
	whois-client/src/main/parser/byacc/peer.y
	whois-client/src/main/parser/byacc/peering.y
	whois-client/src/main/parser/byacc/v6_filter.y
	whois-client/src/main/parser/jflex/aggr_bndry.flex
	whois-client/src/main/parser/jflex/aggr_mtd.flex
	whois-client/src/main/parser/jflex/components.flex
	whois-client/src/main/parser/jflex/components_r6.flex
	whois-client/src/main/parser/jflex/default.flex
	whois-client/src/main/parser/jflex/export.flex
	whois-client/src/main/parser/jflex/filter.flex
	whois-client/src/main/parser/jflex/ifaddr.flex
	whois-client/src/main/parser/jflex/import.flex
	whois-client/src/main/parser/jflex/inject.flex
	whois-client/src/main/parser/jflex/inject_r6.flex
	whois-client/src/main/parser/jflex/interface.flex
	whois-client/src/main/parser/jflex/mp_default.flex
	whois-client/src/main/parser/jflex/mp_export.flex
	whois-client/src/main/parser/jflex/mp_filter.flex
	whois-client/src/main/parser/jflex/mp_import.flex
	whois-client/src/main/parser/jflex/mp_peer.flex
	whois-client/src/main/parser/jflex/mp_peering.flex
	whois-client/src/main/parser/jflex/name.flex
	whois-client/src/main/parser/jflex/peer.flex
	whois-client/src/main/parser/jflex/peering.flex
	whois-client/src/main/parser/jflex/v6_filter.flex
	whois-client/src/main/resources/bin/generateByaccs
	whois-client/src/main/resources/bin/yacc.linux
	whois-client/src/main/resources/bin/yacc.macosx
	whois-client/src/main/resources/byacc/README
	whois-client/src/main/resources/byacc/aggr_bndry.y
	whois-client/src/main/resources/byacc/aggr_mtd.y
	whois-client/src/main/resources/byacc/components.y
	whois-client/src/main/resources/byacc/components_r6.y
	whois-client/src/main/resources/byacc/default.y
	whois-client/src/main/resources/byacc/export.y
	whois-client/src/main/resources/byacc/filter.y
	whois-client/src/main/resources/byacc/ifaddr.y
	whois-client/src/main/resources/byacc/import.y
	whois-client/src/main/resources/byacc/inject.y
	whois-client/src/main/resources/byacc/inject_r6.y
	whois-client/src/main/resources/byacc/interface.y
	whois-client/src/main/resources/byacc/mp_default.y
	whois-client/src/main/resources/byacc/mp_export.y
	whois-client/src/main/resources/byacc/mp_filter.y
	whois-client/src/main/resources/byacc/mp_import.y
	whois-client/src/main/resources/byacc/mp_peer.y
	whois-client/src/main/resources/byacc/mp_peering.y
	whois-client/src/main/resources/byacc/name.y
	whois-client/src/main/resources/byacc/peer.y
	whois-client/src/main/resources/byacc/peering.y
	whois-client/src/main/resources/byacc/v6_filter.y
	whois-client/src/main/resources/jflex/aggr_bndry.flex
	whois-client/src/main/resources/jflex/aggr_mtd.flex
	whois-client/src/main/resources/jflex/components.flex
	whois-client/src/main/resources/jflex/components_r6.flex
	whois-client/src/main/resources/jflex/default.flex
	whois-client/src/main/resources/jflex/export.flex
	whois-client/src/main/resources/jflex/filter.flex
	whois-client/src/main/resources/jflex/ifaddr.flex
	whois-client/src/main/resources/jflex/import.flex
	whois-client/src/main/resources/jflex/inject.flex
	whois-client/src/main/resources/jflex/inject_r6.flex
	whois-client/src/main/resources/jflex/interface.flex
	whois-client/src/main/resources/jflex/mp_default.flex
	whois-client/src/main/resources/jflex/mp_export.flex
	whois-client/src/main/resources/jflex/mp_filter.flex
	whois-client/src/main/resources/jflex/mp_import.flex
	whois-client/src/main/resources/jflex/mp_peer.flex
	whois-client/src/main/resources/jflex/mp_peering.flex
	whois-client/src/main/resources/jflex/name.flex
	whois-client/src/main/resources/jflex/peer.flex
	whois-client/src/main/resources/jflex/peering.flex
	whois-client/src/main/resources/jflex/v6_filter.flex
	whois-client/src/test/java/net/ripe/db/whois/api/rest/RestClientTest.java
	whois-client/src/test/java/net/ripe/db/whois/api/rest/mapper/WhoisObjectClientMapperTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/RpslAttributeTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/RpslObjectFilterTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/AddressPrefixRangeTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/AsBlockRangeTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/DomainTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/Inet6numStatusTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/InetnumStatusTest.java
	whois-client/src/test/java/net/ripe/db/whois/common/rpsl/attrs/NServerTest.java
	whois-commons/src/main/resources/bin/yacc.linux
	whois-commons/src/main/resources/bin/yacc.macosx
	whois-commons/src/main/resources/byacc/README
	whois-commons/src/main/resources/byacc/aggr_bndry.y
	whois-commons/src/main/resources/byacc/aggr_mtd.y
	whois-commons/src/main/resources/byacc/components.y
	whois-commons/src/main/resources/byacc/components_r6.y
	whois-commons/src/main/resources/byacc/default.y
	whois-commons/src/main/resources/byacc/export.y
	whois-commons/src/main/resources/byacc/filter.y
	whois-commons/src/main/resources/byacc/ifaddr.y
	whois-commons/src/main/resources/byacc/import.y
	whois-commons/src/main/resources/byacc/inject.y
	whois-commons/src/main/resources/byacc/inject_r6.y
	whois-commons/src/main/resources/byacc/interface.y
	whois-commons/src/main/resources/byacc/mp_default.y
	whois-commons/src/main/resources/byacc/mp_export.y
	whois-commons/src/main/resources/byacc/mp_filter.y
	whois-commons/src/main/resources/byacc/mp_import.y
	whois-commons/src/main/resources/byacc/mp_peer.y
	whois-commons/src/main/resources/byacc/mp_peering.y
	whois-commons/src/main/resources/byacc/name.y
	whois-commons/src/main/resources/byacc/peer.y
	whois-commons/src/main/resources/byacc/peering.y
	whois-commons/src/main/resources/byacc/v6_filter.y
	whois-commons/src/main/resources/jflex/aggr_bndry.flex
	whois-commons/src/main/resources/jflex/aggr_mtd.flex
	whois-commons/src/main/resources/jflex/components.flex
	whois-commons/src/main/resources/jflex/components_r6.flex
	whois-commons/src/main/resources/jflex/default.flex
	whois-commons/src/main/resources/jflex/export.flex
	whois-commons/src/main/resources/jflex/filter.flex
	whois-commons/src/main/resources/jflex/ifaddr.flex
	whois-commons/src/main/resources/jflex/import.flex
	whois-commons/src/main/resources/jflex/inject.flex
	whois-commons/src/main/resources/jflex/inject_r6.flex
	whois-commons/src/main/resources/jflex/interface.flex
	whois-commons/src/main/resources/jflex/mp_default.flex
	whois-commons/src/main/resources/jflex/mp_export.flex
	whois-commons/src/main/resources/jflex/mp_filter.flex
	whois-commons/src/main/resources/jflex/mp_import.flex
	whois-commons/src/main/resources/jflex/mp_peer.flex
	whois-commons/src/main/resources/jflex/mp_peering.flex
	whois-commons/src/main/resources/jflex/name.flex
	whois-commons/src/main/resources/jflex/peer.flex
	whois-commons/src/main/resources/jflex/peering.flex
	whois-commons/src/main/resources/jflex/v6_filter.flex
	whois-commons/src/main/resources/patch/whois-1.70-2.sql
	whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/BaseEndToEndSpec.groovy
	whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/BaseQueryUpdateSpec.groovy
	whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/DomainAuthSpec.groovy
	whois-endtoend/src/test/groovy/net/ripe/db/whois/spec/update/UnrefCleanupSpec.groovy
	whois-endtoend/src/test/java/net/ripe/db/whois/WhoisFixture.java
	whois-internal/src/main/java/net/ripe/db/whois/internal/api/abusec/AbuseCService.java
	whois-internal/src/main/java/net/ripe/db/whois/internal/api/acl/AclLimitService.java
	whois-internal/src/main/java/net/ripe/db/whois/internal/logsearch/NewLogFormatProcessor.java
	whois-internal/src/test/java/net/ripe/db/whois/internal/api/abusec/AbuseCServiceTestIntegration.java
	whois-internal/src/test/java/net/ripe/db/whois/internal/api/acl/AclProxyServiceTest.java
	whois-internal/src/test/java/net/ripe/db/whois/logsearch/LogFileHelper.java
	whois-oneshot/src/main/java/net/ripe/db/ascleanup/AutNumCleanup.java
	whois-query/src/main/java/net/ripe/db/whois/query/executor/decorators/FilterPersonalDecorator.java
	whois-query/src/main/java/net/ripe/db/whois/query/planner/AbuseCInfoDecorator.java
	whois-query/src/main/java/net/ripe/db/whois/query/planner/RpslResponseDecorator.java
	whois-query/src/main/java/net/ripe/db/whois/query/query/AbuseContactValidator.java
	whois-query/src/main/java/net/ripe/db/whois/query/query/CombinationValidator.java
	whois-query/src/main/java/net/ripe/db/whois/query/query/Query.java
	whois-query/src/main/java/net/ripe/db/whois/query/query/TagValidator.java
	whois-query/src/test/java/net/ripe/db/whois/query/endtoend/compare/query/QueryExecutor.java
	whois-query/src/test/java/net/ripe/db/whois/query/planner/AbuseCInfoDecoratorTest.java
	whois-query/src/test/java/net/ripe/db/whois/query/planner/RpslResponseDecoratorTest.java
	whois-query/src/test/resources/comparison_queries
	whois-scheduler/src/test/java/net/ripe/db/whois/scheduler/task/grs/ResourceTaggerJdbcTest.java
	whois-update/src/main/java/net/ripe/db/whois/update/authentication/Authenticator.java
	whois-update/src/main/java/net/ripe/db/whois/update/authentication/strategy/InetnumAuthentication.java
	whois-update/src/main/java/net/ripe/db/whois/update/authentication/strategy/MntByAuthentication.java
	whois-update/src/main/java/net/ripe/db/whois/update/domain/UpdateMessages.java
	whois-update/src/main/java/net/ripe/db/whois/update/mail/MailGatewaySmtp.java
	whois-update/src/test/java/net/ripe/db/whois/update/authentication/AuthenticatorPrincipalTest.java
	whois-update/src/test/java/net/ripe/db/whois/update/authentication/strategy/MntByAuthenticationTest.java