commitPathsFromLoader was removed by merge

...plus minor change in amber.js that was also lost.