This reverts commit ada1b0d24e. Conflicts: openid-connect-client/src/test/java/org/mitre/openid/connect/client/service/impl/TestPlainAuthRequestUrlBuilder.java
ada1b0d24e