use osx not mac as an identifier for the os.
adopt css to mac-> osx change
the class for the html tag is linux32 - not just linux
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'feature/4109-https-sources' into develop
reset button loading... state on error (#4231)

including test
refactored error display some