Final changes to the Rakefile for deployment strategy

Change-Id: I74d23ea091e7d8a605fd12fc0a457d3444b4baea