Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]
Bug 837251 - Compose textarea doesn't occupy available screen space or show bounding box. r=asuth

Includes some minor review fixes by asuth.
Bug 960901 - (lockscreen-instance) [LockScreen] Make LockScreen as an instantiable function
Merge pull request #16345 from asutherland/email-contenteditable

Bug 837251 - Compose textarea doesn't occupy available screen space or show bounding box. r=asuth
Merge pull request #16313 from snowmantw/issue960901-instantiable-lockscreen

Bug 960901 - (lockscreen-instance) [LockScreen] Make LockScreen as an instantiable function
Bug 972160 - Run specific marionette tests for 30 times on Travis.
Merge pull request #16244 from evanxd/bug-972160

Bug 972160 - Run specific marionette tests for multiple times on Travis.
Bug 959414 - [B2G][Contacts] Cancelling out of editing or Updating a contact after importing displays broken UI
Bug 972953 - Speed up travis r=gaye,julien
Merge pull request #16210 from EverythingMe/bug-968963

Bug 968963 - [E.me] Collection static apps names are not translated [r=ranbena]
Merge pull request #16287 from EragonJ/bug-971565

Bug 971565 - [System2] Instantiable Title
Merge pull request #16298 from crdlc/bug-959414-master

Bug 959414 - [B2G][Contacts] Cancelling out of editing or Updating a con...
Revert "Merge pull request #16287 from EragonJ/bug-971565"

This reverts commit f5de3036859c58eed929e3d488ef0c594176a5b2, reversing
changes made to 4606c99d4a3f4b95f26e726b2efc5e57089147f3.
Bug 971565 - [System2] Instantiable Title

- update test
- update bootstrap.js
- add necessary mock for bootstrap_test.js