Changes for building meta-agl-demo with YP 2.1.1 'krogoth'