branch argument in PropsLoaderFactory.loadBranch was handled incorrectly.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	java/project/Build.scala
Plugins an dependencies update.