Merge "Remove ci/deploy directory" into stable/brahmaputra