move to proper location in trunk
Authored by: dgrove-oss 2015-08-21
Parent: [r29737]
Child: [r29739]