scons: Update to 2.3.1
openssh: Update to 6.6p1