Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.16.17
  Do not overwirte /etc/default/gerritcodereview upon upgrade
  Avoid use of negative checks for directories

Change-Id: I1e1ececb0fc3fcc2073fed6fc041549d38dfffda
diff --git a/fpm/scripts/after-install.sh b/fpm/scripts/after-install.sh
index 485f06e..edb2a61 100755
--- a/fpm/scripts/after-install.sh
+++ b/fpm/scripts/after-install.sh
@@ -2,8 +2,8 @@
 LOG=/tmp/gerrit-installer.log
 chmod a+rw $LOG
 
-[ ! -d /etc/default ] && mkdir -p /etc/default
-echo "GERRIT_SITE=$GERRIT_SITE" > /etc/default/gerritcodereview
+[ -d /etc/default ] || mkdir -p /etc/default
+[ -f /etc/default/gerritcodereview ] || echo "GERRIT_SITE=$GERRIT_SITE" > /etc/default/gerritcodereview
 
 echo ""
 echo -n "Initialising Gerrit site ... "