Update for MESOS-1126 - libjvm dlopen

Conflicts:
	src/Makefile.am