Merge changes I8c70f568,I96c43cff

* changes:
  More options and rename maps; one file per rust_test
  Use rustlibs and not deny_warnings.