Fix task of disabling os-collect-config
Fix task of disabling os-collect-config

During the re-organization of the playbook, the disabling of
os-collect-config was slightly shuffled which resulted in the
single run of os-collect-config failing due the lock file being
already held.  This commit changes that so it is disabled before
the explicit run.

Change-Id: I95e7dd32c5b252ec1b27efe00c47e486173faf12

SpamapS/tripleo-ansible,SpamapS/tripleo-ansible