Comment 15 for bug 2015420

Linked new merge proposals with a different approach to the problem - checking for a marker file instead of passing an option in a conf script - and updated the description to match the new approach.