Merge pull request #605 from mposolda/master

LDAP testing and improvements
Improve TimerSPI to support cancelling of previously scheduled tasks
Sync - first iteration