Switch to sp_interlocked.hpp
Remove interlocked.hpp, was left behind by the merge
Merge branch 'develop'