FELIX-1296 : Fix handling of @PropertyOption for the @Property annotation. Applied modified patch from Victor Antonovich