(cherry picked from commit 4f7c90660226b05edc3581454d18fd53a4762802) Conflicts: project/AkkaBuild.scala