Upgrade branch 2.6.x using TemplateControl

[richdougherty]

Updated with template-control on 2017-08-12T02:43:28.188Z
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.3")

[richdougherty]

Failure on Travis:

[info] ServerSpec:
[info] integration.ServerSpec *** ABORTED ***
[info]   java.security.UnrecoverableKeyException: Password must not be null
[info]   at sun.security.provider.JavaKeyStore.engineGetKey(JavaKeyStore.java:132)
[info]   at sun.security.provider.JavaKeyStore$JKS.engineGetKey(JavaKeyStore.java:56)
[info]   at sun.security.provider.KeyStoreDelegator.engineGetKey(KeyStoreDelegator.java:96)
[info]   at sun.security.provider.JavaKeyStore$DualFormatJKS.engineGetKey(JavaKeyStore.java:70)
[info]   at java.security.KeyStore.getKey(KeyStore.java:1023)
[info]   at com.typesafe.sslconfig.ssl.ConfigSSLContextBuilder.$anonfun$validateStoreContainsPrivateKeys$2(SSLContextBuilder.scala:340)
[info]   at com.typesafe.sslconfig.ssl.ConfigSSLContextBuilder.$anonfun$validateStoreContainsPrivateKeys$2$adapted(SSLContextBuilder.scala:339)
[info]   at scala.collection.Iterator.foreach(Iterator.scala:929)
[info]   at scala.collection.Iterator.foreach$(Iterator.scala:929)
[info]   at scala.collection.AbstractIterator.foreach(Iterator.scala:1406)
[info]   ...
[INFO] [08/12/2017 03:02:01.446] [Thread-1] [CoordinatedShutdown(akka://testing)] Starting coordinated shutdown from JVM shutdown hook
[info] ScalaTest
[info] Run completed in 3 seconds, 595 milliseconds.
[info] Total number of tests run: 0
[info] Suites: completed 0, aborted 1
[info] Tests: succeeded 0, failed 0, canceled 0, ignored 0, pending 0
[info] *** 1 SUITE ABORTED ***
[error] Error: Total 1, Failed 0, Errors 1, Passed 0
[error] Error during tests:
[error]     integration.ServerSpec
[error] (root/test:test) sbt.TestsFailedException: Tests unsuccessful

[richdougherty]

Failed again, so probably a real failure.

[richdougherty]

@marcospereira, I didn't merge this one because I think the test needs fixing…