bundle edit_line converge fixups, converge_prepend addition/master#1855

nickanderson merged 5 commits intocfengine:mastercfengine/masterfiles:masterfrom

nickanderson:converge_prepend/masternickanderson/masterfiles:converge_prepend/masterCopy head branch name to clipboard