am faee53c0: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'faee53c0880c637acd9bf23b4a7aadeeb4a50085': Revert "Correctly add double quote to the space strippers" Revert "Only add spaces automatically when appropriate."main
commit
9b935084ea