added some routing tests
refs #637
routing test adjustments 
refs #637
Fixed #639: Form Population trips over entities in error messages when inserting them into the document
changelog woot
merging fa5b0ce18946e7b5f5d935a3e4aaeb5f44f458b1 to c02becf428dc32a29babe9e6e289a87ab36da60f
merging 9b95211113543964120ebfae972e04b8e0e0b81f to 002daedb956e5cfde7296c72ae86453ccb2e23fc