timestamp change to ISO860

Merge pull request #2 from mchalski/2.2.0-java-opts

allow passing java opts to conductor

Merge pull request Netflix#951 from Netflix/fix_retry

fix retry

Merge pull request Netflix#949 from Netflix/bugfix/retry_workflow_upd…

…ate_task

fix for update task during retry workflow

Merge pull request Netflix#945 from Netflix/update_workflow_then_task…

…_for_retry

update workflow before creating/updating task for retry/rerun

fix searching taskDefinition by taskDef, not taskType

fix for retrying http tasks

Merge branch 'master' into dev

Merge pull request Netflix#930 from Netflix/remove_apis_return

return boolean from remove api in dao

Merge pull request Netflix#926 from Netflix/http_task_mapper

added http task mapper