Fixed deadlock.

The attempt to fix this problem from 3cecb36 was incomplete.  There was
another instance where timer.cancel() was being called but didn't need
to be.

I've removed some unneeded synchronization, which was causing a
deadlock,  and added a separate scheduler service for the MesosTracker
timers.
Merge pull request #10 from brndnmtthws/deadlock-fix2

Fixed deadlock.
Improved handling of TaskTracker cleanup.
Added jobtracker metrics.
Merge pull request #11 from brndnmtthws/master

Added metrics, fixed zombie trackers.
Adding port fixes
Merge branch 'port-fixes2' of github.com:mesos/hadoop into staging

Conflicts:
	pom.xml
	src/main/java/org/apache/hadoop/mapred/ResourcePolicy.java