Improved reload configuration locking in order to avoid dead-lock.
Authored by: dmg75it 2014-12-31
Parent: [r390]
Child: [r392]