missed a few 2.1.2 changes
missed a few 2.1.2 changes


Former-commit-id: bf2d1c96c62fc80134bbab25b3dc042e61a9fdd1
Former-commit-id: 7ed498b1034992d6013a14666343db358bef4776 [formerly 082fa408e8910246e350f672b2f4b24b8f115ebd] [formerly a683bc19fd814f6ef25f5e17ef3fee2bf1532c21 [formerly bc87fe1b05bfe90cf680eec5f2f4aff264cfebf6]]
Former-commit-id: 13eba6037b42c79729bed3d9d49ea0e31e66c432 [formerly ac1b0c28831d694a0b7990951ec427533c4b2216]
Former-commit-id: c5896deee744e04fba56df2f5584f56127f5c8c3
ARentz07/rundeck,edwlarkey/rundeck,edwlarkey/rundeck,ronabop/rundeck,ARentz07/rundeck,ronabop/rundeck,ARentz07/rundeck,edwlarkey/rundeck,ronabop/rundeck