allow single value constraints as value
Merge branch 'develop' of github.com:/fp7mplane/protocol-ri into develop