remote-1032789: Pass requisition to mockSettings. Kill require(settings)
remote-1032789: Pass requisition to mockSettings. Kill require(settings)

Merge commit 'd64ab13' into mozremote-1032789

Conflicts:
	lib/gcli/test/mockSettings.js

Signed-off-by: Joe Walker <7a17872fbb32c7d760c9a16ee3076daead11efcf@mozilla.com>

mozilla/gcli,mozilla/gcli,mozilla/gcli