Merge pull request #443 from peternewman/e1.37-2

Convert ola_uni_stats to our flags and some minor flags improvements
Merge pull request #444 from peternewman/e1.37-2

Refactor code into a StripPrefix function