* Search for macaddresses more stringently Fixes #40829
* Revert model and serialnum to older version * Add stacked versions of model and serialnum as separate facts * Add unit test to check stacked output * Alter model regex to address #34768