Merge pull request #487 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to...

Merge pull request #487 in SNORT/snort3 from ~MIALTIZE/snort3:for-russ-trivial to master

Squashed commit of the following:

commit 8b44097a7d6531e273a7dc20963712a4f4f77dc2
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue May 24 00:23:20 2016 +0000

    sfdaq: Fix memory leak in module per-instance configuration

commit a7681dfc7f788c5753f0962fed419e25c06410bd
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue May 24 00:08:52 2016 +0000

    sfdaq: Fix incorrectly overwriting last per-instance config