Various merge resolutions from master <- staging

* --ask option ported to new location
* --version option now works
* MSF version updated
* All specs passing
Deprecation warnings hidden for non-listeners
Land #3654, update to 4.10-dev (electro)