Merge "Update to use version 1.5.9-SNAPSHOT of parent pom" into frankfurt