ModeShape upgrade to 3.6, including necessary change to test PEP
Merge pull request #126 from gregjan/pivotal-59504832

ModeShape upgrade to 3.6, including necessary change to test PEP

Resolves: https://www.pivotaltracker.com/story/show/59504832