Fix plone.app.lockingbehavior inclussion and work around failing test

See: http://stackoverflow.com/q/27430323/644075