Merge branch 'release-0.6.8'
Conflicts:
bin/common.sh
build.sbt
dist/bin/backup
dist/bin/common.sh
dist/bin/restore
dist/bin/updatecheck
dist/bin/upgrade
dist/conf/init.json
servers/admin/build.sbt
servers/api/build.sbt
servers/scheduler/build.sbt
servers/scheduler/conf/application.conf
tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Backup.scala
tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Restore.scala
tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/UpdateCheck.scala
tools/softwaremanager/src/main/scala/io/prediction/tools/softwaremanager/Upgrade.scala
