Merge remote-tracking branch 'wchen-r7/optint_valid' into rapid7
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
Unbreak OptInt hex syntax

* Fix spec for no-longer-pending tests
* Fix regex in OptInt#valid? to allow hex syntax again

[See #1293][See #1296]