Merge "update joid install script with corrections, functest admin-openrc default...
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 17 Dec 2015 15:52:43 +0000 (15:52 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 17 Dec 2015 15:52:43 +0000 (15:52 +0000)

Trivial merge