[stompclt/el6] Update to upstream, rhbz #1061604.

[mpaladin]

Summary of changes:

  e264b2c... Update to upstream, rhbz #1061604. (*)

(*) This commit already existed in another branch; no separate mail sent