Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev