cleanup klocwork 6/18/14 errors in scd framework
Merge branch 'scd_klock_fixup'