Merge branch 'hotfix-002'
Merge branch 'hotfix-003'
Merge branch 'develop'
Change package versions to allow older versions required for sintero ubuntu diet
Merge branch 'hotfix-003' into develop