Merge changes I975ba933,Ica9d211b

* changes:
  Add tests for multiton issue
  Add GetExecutableDirectory to libbase