- sync charmhelpers with fix-alpha helpers
- fix up code where the alpha comparisons are done
- fix tests which assumed mocks would just work on os_release()

Change-Id: I752198f807bc82f07f2a50e295c4d2936c3ad745
Related-Bug: #1659575