Package: emacs
Version: 25.0.50

Current master on RHEL7.1, --with-x-toolkit=athena,
--without-toolkit-scroll-bars.

emacs -Q:
The scroll-bar thumb is in the tool-bar, rather than being in the
scoll-bar where it belongs. See attached image.

I'm going to semi-randomly point the finger at the Cairo merge,
which didn't originally build --without-toolkit-scroll-bars.