updated paths for smarttab repos
initial 4.2 multi-device work
Merge remote-tracking branch 'origin/4.2' into 4.2