Also, if specific shipyard password is defined, pass it on to shipyard component instead of OS_PASSWORD (which might be defined with the value for another cloud). Change-Id: I42d9797c8177ad4da2b401f874fb21a00e045883