Merging and comments/whitespace.

[Rupert Smith]

For the sake of merging, please try to avoid re-flowing comments, or
re-ordering import statements (unless they differ from the code format
rules).

For example:

    /* Holds the name of the property to get the fail before send flag from.
*/

To:

    /**
     * Holds the name of the property to get the fail before send flag from.
     */

It just creates pointlessly annoying diffs, that confuse the whole issue.

Thanks.

Rupert