Merge pull request #1237 in SNORT/snort3 from 245 to master

Merge pull request #1237 in SNORT/snort3 from 245 to master

Squashed commit of the following:

commit 451b9ec52a96fefed5948c4b2d4f79173cd70496
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed May 23 09:06:15 2018 -0400

    file_id: claim gid 146 to avoid legacy issues

commit 1fb59288145a0e883da710f5309ca5e475ca022f
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed May 23 08:59:40 2018 -0400

    events: rename some gid and sid defines for consistency and clarity

commit 1c2156f4cbc7dc50556610b0c01a27b1efe3e662
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed May 23 02:16:33 2018 -0400

    parser: gid value does not indicate rule type

commit 94f77577256b13b1d5edbf0fc21c7613d501f3b3
Author: Russ Combs (rucombs) <rucombs@cisco.com>
Date:   Wed May 23 02:07:07 2018 -0400

    parser: warn about text rules w/o detection options

commit 92969aba5c224525b877c69397b02956fbc7c708
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon May 21 10:25:03 2018 -0400

    build 245