Merge remote-tracking branch 'origin/stable/2.0'

diff --cc doc/Building_FRR_on_Ubuntu1604.md
index 70a8159cc1d09cef7fa56d0435c16f63e26928e9,7848ff68abe85e8c2c8b8dbbb33656570548a207..327b7d68a0701d5c26bd7959d537c8ac69578b76
--- 1/doc/Building_FRR_on_Ubuntu1604.md
--- 2/doc/Building_FRR_on_Ubuntu1604.md
+++ b/doc/Building_FRR_on_Ubuntu1604.md
@@@ -36,8 -36,10 +36,9 @@@ an example.
  
      git clone https://github.com/frrouting/frr.git frr
      cd frr
 -    git checkout stable/2.0
      ./bootstrap.sh
      ./configure \
+         --prefix=/usr \
          --enable-exampledir=/usr/share/doc/frr/examples/ \
          --localstatedir=/var/run/frr \
          --sbindir=/usr/lib/frr \