Remove old commented out code in sqlalchemy models

Change-Id: I0e49d00ce8790c8498976c2bf7bcfd9b69bfb5a4
Merge "Remove old commented out code in sqlalchemy models"
Merge remote-tracking branch 'm_src_repo/master' into build-temp