Merge "New JJB files for airshipinabottle_deploy project"