Fredi Discovery Changes
Merge branch 'bare_metal' of https://github.com/adaman79/foreman-poc into bare_metal