Make sure these files ignored by .gitignore are added.
Merge with Trunk Revision 11021.
Merge with Trunk revision 11046.
.gitignore is getting on my nerves.
Merge with Trunk Revision 11109
Merge with Trunk revision 11167
Complete the incomplete merge.
Merge branch 'master' into multilock
Subsystem locking should respect max active seekers.
Make sure we clear out a lock if ship is dying.