Tested the scripts in the Atlanta Lab and ran into issues
with 'max_shipyard_count' and 'shipyard_query_time' variables
as we will need to export them as environment variables as well.
This patch set is meant to correct the problem.
Change-Id: I0ae407adac3df6a0cbe027a70940ee65904a7854