Fix incorrectly nested locking.
Fix incorrectly nested locking.

Fix a couple of cases of incorrectly nested locking.  The code protected
by the locking isn't anything in which incorrect nesting could lead to
deadlock, but it still bothers me, so I'm fixing it as a matter of
principle.


git-svn-id: 88467cb1fb04b8a755be7e1ee1026be4190196ef@16512 3a8e244f-b0f2-452b-bcba-4c88e055c3ca

chizarlicious/chapel,CoryMcCartan/chapel,sungeunchoi/chapel,sungeunchoi/chapel,sungeunchoi/chapel,hildeth/chapel,sungeunchoi/chapel,chizarlicious/chapel,chizarlicious/chapel,sungeunchoi/chapel,CoryMcCartan/chapel,sungeunchoi/chapel,chizarlicious/chapel,hildeth/chapel,chizarlicious/chapel,sungeunchoi/chapel,CoryMcCartan/chapel,CoryMcCartan/chapel,hildeth/chapel,chizarlicious/chapel,CoryMcCartan/chapel,hildeth/chapel,CoryMcCartan/chapel,chizarlicious/chapel,sungeunchoi/chapel,CoryMcCartan/chapel,hildeth/chapel,hildeth/chapel,hildeth/chapel