Merge "OpenContrail 4 add restart:always for containers"