resolving conflicts; some more changes in the process
Authored by: vsp_nagel 2014-01-22
Parent: [r27551]
Child: [r27553]