Merge "Make runhat command work again." into jb-mr1-dev