ACT-1696: fix for ldap qa build (apache DS not shutting down quickly enough)
Merge branch 'master' of github.com:Activiti/Activiti