sync commit of app2
Merge branch 'master' of github.com:Alfresco/thunderops