Adopt commit 132b930 from master: Merge pull request #222 from hrosen4/no-DUMMY-drqs-79583761
Adopt commit 132b930 from master: Merge pull request #222 from hrosen4/no-DUMMY-drqs-79583761

commit 132b9305f67ad2df93b6cb998a4ede97e049337d
Merge: 444a05b 5ed1830
Author: Henry Verschell <hverschell@bloomberg.net>
Date:   Mon Mar 14 16:26:44 2016 -0400

    Merge pull request #222 from hrosen4/no-DUMMY-drqs-79583761

    DUMMY => DUMMY_TYPE to avoid macro collision

commit 5ed183002e98810b05734eb0a78577b22cddae34
Author: Hyman Rosen <hrosen4@bloomberg.net>
Date:   Mon Mar 14 16:09:06 2016 -0400

    DUMMY => DUMMY_TYPE to avoid macro collision

che2/bde,bloomberg/bde,apaprocki/bde,dharesign/bde,bowlofstew/bde,dharesign/bde,apaprocki/bde,che2/bde,bloomberg/bde,apaprocki/bde,apaprocki/bde,apaprocki/bde,che2/bde,che2/bde,bloomberg/bde,bowlofstew/bde,dharesign/bde,dharesign/bde,bloomberg/bde,bloomberg/bde,bowlofstew/bde,bowlofstew/bde