CBLT-166:  only copy binary if it exists
CBL-4:     change order to test for sync problem

Change-Id: Icf3b87c23b24d407d1df1135cec5c3964b13b026