Merge changes Ic6c850a6,I2f817418

* changes:
  Added openldap build, add new DOCKER_GIT_TAG param
  Added extensible choice plugin, disable system reclass autotesting