ENGOPS-104 - Updated the OS License html file
Merge pull request #231 from dkincade/master

ENGOPS-104 - Updated the OS License html file
PRD-4254 - Fixing bugs shown by tests
Merge remote-tracking branch 'origin/master' into PRD-5.0-obesity