Fixed deadlocking issue by removing ReaderWriterLock and replacing with lock expressions around both places the value is retrieved and set
Merge pull request #258 from roend83/build-plan-threading-issue

Fixed deadlocking issue by removing ReaderWriterLock and replacing with lock expressions