Change MAX_TIME
Merge pull request #121 from jmmovilla/bug/CLAUDIA-4357

Change MAX_TIME
Merge remote-tracking branch 'upstream/develop' into task/adapt_attribute_value_puppet
add tests according to comments