treehouses ap with sync and rearranged lines (fixes #2266)#2267

dogi wants to merge 1 commit intomastertreehouses/cli:masterfrom

ap-rearrangetreehouses/cli:ap-rearrangeCopy head branch name to clipboard