Merge "ubuntu-server-cloudimg-modify: fix location of #! shell line"