Revision 1884592

Merge r1875675 from trunk:

 * r1875675
   Rewrite load_normalize_node_props to avoid literal trailing spaces.
   Justification:
     Prevents the bug fixed in r1875620 from recurring.
   Votes:
     +1: danielsh, brane, jcorvel