Change in priority for force sync vs have.

      | FORCE |  !FORCE
HAVE  |   -f  |
!HAVE |   -f  |   -p
Missing client update on template workspaces.
Merge remote-tracking branch 'upstream/master'
More fixes...