Dev tools master based

This pull request is largely for LRDOCS 679, Service Builder Section of chapter 2. I know you're on vacation right now, so I won't look for your review comments right away.