Merge branch 'oldInfraNewAnalysis' of ssh://plrg.eecs.uci.edu/home/git/smartthings...